X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=60e7e3081a0ba00fce334c5ec16f5527181ceae1;hb=18037c60a42e96cf61b13006bb391e3699bdc45e;hp=2b1441a2756d862efde60cff2d5cc02e7c8db328;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc index 2b1441a275..60e7e3081a 100644 --- a/lily/event-chord-iterator.cc +++ b/lily/event-chord-iterator.cc @@ -20,22 +20,11 @@ Event_chord_iterator::Event_chord_iterator () { } -Context * -Event_chord_iterator::get_bottom_context () -{ - assert (get_outlet ()); - if (get_outlet ()->is_bottom_context ()) - return get_outlet (); - - set_context (get_outlet ()->get_default_interpreter ()); - return get_outlet (); -} - void Event_chord_iterator::construct_children () { Simple_music_iterator::construct_children (); - get_bottom_context (); + descend_to_bottom_context (); } void @@ -47,10 +36,7 @@ Event_chord_iterator::process (Moment m) scm_is_pair (s); s = scm_cdr (s)) { Music *mus = unsmob_music (scm_car (s)); - - bool gotcha = try_music (mus); - if (!gotcha) - mus->origin ()->warning (_f ("junking event: `%s'", mus->name ())); + report_event (mus); } } Simple_music_iterator::process (m);