X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fquote-iterator.cc;h=17f7b7143342260173f6f61c4f02db233a8f1e12;hb=7c97fdea910b6c97606f5f66b5b5a0a001193451;hp=c8e8a1a42e2c79f0f7fcd1d59e3e651f466ee590;hpb=40aac0ae57ee113faa860ba221d83d9e6312173e;p=lilypond.git diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc index c8e8a1a42e..17f7b71433 100644 --- a/lily/quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -194,7 +194,7 @@ Moment Quote_iterator::vector_moment (int idx) const { SCM entry = scm_c_vector_ref (event_vector_, idx); - return *unsmob_moment (scm_caar (entry)); + return *Moment::unsmob (scm_caar (entry)); } void @@ -235,15 +235,15 @@ Quote_iterator::process (Moment m) if (quote_ok ()) { SCM entry = scm_c_vector_ref (event_vector_, event_idx_); - Pitch *quote_pitch = unsmob_pitch (scm_cdar (entry)); + Pitch *quote_pitch = Pitch::unsmob (scm_cdar (entry)); /* The pitch that sounds when written central C is played. */ Pitch temp_pitch; - Pitch *me_pitch = unsmob_pitch (get_music ()->get_property ("quoted-transposition")); + Pitch *me_pitch = Pitch::unsmob (get_music ()->get_property ("quoted-transposition")); if (!me_pitch) - me_pitch = unsmob_pitch (get_outlet ()->get_property ("instrumentTransposition")); + me_pitch = Pitch::unsmob (get_outlet ()->get_property ("instrumentTransposition")); else { // We are not going to win a beauty contest with this one, @@ -260,7 +260,7 @@ Quote_iterator::process (Moment m) { SCM ev_acc = scm_car (s); - Stream_event *ev = unsmob_stream_event (scm_car (ev_acc)); + Stream_event *ev = Stream_event::unsmob (scm_car (ev_acc)); if (!ev) programming_error ("no music found in quote"); else if (accept_music_type (ev, is_cue))