X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=fcfd2fc1f45cfe31923730b7d957eb49b5dde9dc;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=036a0c324945341182b4c4a04b2a6043e17b8b8d;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 036a0c3249..fcfd2fc1f4 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -118,7 +118,7 @@ Music_iterator::music_start_mom ()const } void -Music_iterator::init_context (Music *m, Context *report) +Music_iterator::init_translator (Music *m, Context *report) { music_ = m; assert (m); @@ -145,7 +145,7 @@ Music_iterator::get_iterator (Music *m) const SCM ip = get_static_get_iterator (m); Music_iterator *p = unsmob_iterator (ip); - p->init_context (m, get_outlet ()); + p->init_translator (m, get_outlet ()); p->construct_children (); return ip; @@ -165,11 +165,8 @@ Music_iterator::report_event (Music *m) { descend_to_bottom_context (); - /* - FIXME: then don't do it. - */ if (!m->is_mus_type ("event")) - m->origin ()->programming_error (_ ("Sending non-event to context")); + m->origin ()->warning (_f ("Sending non-event to context")); m->send_to_context (get_outlet ()); }