X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event.cc;h=12219884b1071d40e9919e4cf13b771b515d2148;hb=9e338fb9a890089a44a3c36ae3c95653027718d5;hp=1019c9e85bf728b06b3178fecb85c4374dfd5d10;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git diff --git a/lily/stream-event.cc b/lily/stream-event.cc index 1019c9e85b..12219884b1 100644 --- a/lily/stream-event.cc +++ b/lily/stream-event.cc @@ -11,7 +11,7 @@ #include "ly-smobs.icc" #include "context.hh" #include "input.hh" -#include "input-smob.hh" +#include "input.hh" /* TODO: Rename Stream_event -> Event */ @@ -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 *