X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event.cc;h=64c9a979d9950907dde19ffbb0a49978a5a21f12;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=7fb596c26475c7a088797601c14f978ce1bf19b6;hpb=e0af94bb8939bc6f4998db6294010baa77139092;p=lilypond.git

diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index 7fb596c264..64c9a979d9 100644
--- a/lily/stream-event.cc
+++ b/lily/stream-event.cc
@@ -54,7 +54,7 @@ Stream_event::copy_mutable_properties () const
 Input *
 Stream_event::origin () const
 {
-  Input *i = Input::unsmob (get_property ("origin"));
+  Input *i = unsmob<Input> (get_property ("origin"));
   return i ? i : &dummy_input_global;
 }
 
@@ -86,20 +86,20 @@ Stream_event::make_transposable ()
       SCM prop = scm_car (entry);
       SCM val = scm_cdr (entry);
 
-      if ((Pitch::is_smob (val)
-           || (scm_is_eq (prop, ly_symbol2scm ("element")) && Music::is_smob (val))
+      if ((unsmob<Pitch> (val)
+           || (scm_is_eq (prop, ly_symbol2scm ("element")) && unsmob<Music> (val))
            || (scm_is_eq (prop, ly_symbol2scm ("elements")) && scm_is_pair (val))
            || (scm_is_eq (prop, ly_symbol2scm ("pitch-alist")) && scm_is_pair (val)))
           && scm_is_false (scm_assq (prop, mutable_property_alist_)))
         mutable_property_alist_
-          = scm_acons (prop, ly_music_deep_copy (val), mutable_property_alist_);
+          = scm_acons (prop, music_deep_copy (val), mutable_property_alist_);
     }
 }
 
 SCM
 Stream_event::dump (SCM self)
 {
-  Stream_event *ev = Stream_event::unsmob (self);
+  Stream_event *ev = unsmob<Stream_event> (self);
   // Reversed alists look prettier.
   return scm_cons (scm_reverse (ev->immutable_property_alist_),
                    scm_reverse (ev->mutable_property_alist_));