Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / stream-event.cc

diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index 7a1118e65af459566227edd71d557ed1fa646ce1..12219884b1071d40e9919e4cf13b771b515d2148 100644 (file)
--- a/lily/stream-event.cc
+++ b/lily/stream-event.cc
@@ -27,12 +27,6 @@ Stream_event::Stream_event (SCM event_class, SCM mutable_props)
   mutable_property_alist_ = mutable_props;
 }
 
-Stream_event::Stream_event (SCM property_alist)
-  : Prob (ly_symbol2scm ("Stream_event"), SCM_EOL)
-{
-  mutable_property_alist_ = property_alist;
-}
-
 Stream_event::Stream_event (SCM class_name, Input *origin)
   : Prob (ly_symbol2scm ("Stream_event"),
          scm_list_1 (scm_cons (ly_symbol2scm ("class"), class_name)))
@@ -41,11 +35,10 @@ Stream_event::Stream_event (SCM class_name, Input *origin)
     set_spot (origin);
 }
 
-Stream_event::Stream_event (Stream_event *ev)
-  : Prob (ly_symbol2scm ("Stream_event"), SCM_EOL)
+SCM
+Stream_event::copy_mutable_properties () const
 {
-  mutable_property_alist_ = scm_copy_tree (ev->mutable_property_alist_);
-  immutable_property_alist_ = ev->immutable_property_alist_;
+  return ly_event_deep_copy (mutable_property_alist_);
 }
 
 Input *