X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-iterator.cc;h=01039d66ab42ecd65372ccbcbd9eeccf4cbcf62b;hb=dd0a17d22eafb4551e849607ded6179e8e95fa57;hp=78ecb21b9fb204a67aef662ab47443f95c726722;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git

diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index 78ecb21b9f..01039d66ab 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -390,10 +390,10 @@ Part_combine_iterator::construct_children ()
   SCM lst = get_music ()->get_property ("elements");
   Context *one = handles_[CONTEXT_ONE].get_context ();
   set_context (one);
-  first_iter_ = Music_iterator::unsmob (get_iterator (unsmob_music (scm_car (lst))));
+  first_iter_ = Music_iterator::unsmob (get_iterator (Music::unsmob (scm_car (lst))));
   Context *two = handles_[CONTEXT_TWO].get_context ();
   set_context (two);
-  second_iter_ = Music_iterator::unsmob (get_iterator (unsmob_music (scm_cadr (lst))));
+  second_iter_ = Music_iterator::unsmob (get_iterator (Music::unsmob (scm_cadr (lst))));
   Context *shared = handles_[CONTEXT_SHARED].get_context ();
   set_context (shared);
 
@@ -443,7 +443,7 @@ Part_combine_iterator::set_busy (SCM se)
   if (!notice_busy_)
     return;
 
-  Stream_event *e = unsmob_stream_event (se);
+  Stream_event *e = Stream_event::unsmob (se);
 
   if (e->in_event_class ("note-event") || e->in_event_class ("cluster-note-event"))
     busy_ = true;