X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer-group-performer.cc;h=053a5f32fce04e61dc2fabdeff25d6e3e6ded9fa;hb=07cba348de41ccb71a4707726b2f6c5510f33d49;hp=5d35c404482b9128558cdfce31a104da60a8d63f;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index 5d35c40448..053a5f32fc 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -3,9 +3,9 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2004 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ + (c) 1996--2005 Han-Wen Nienhuys + Jan Nieuwenhuizen +*/ #include "performer-group-performer.hh" @@ -13,15 +13,13 @@ #include "audio-element.hh" #include "warn.hh" -ENTER_DESCRIPTION (Performer_group_performer, -/* descr */ "", -/* creats*/ "", -/* accepts */ "", -/* acks */ "", -/* reads */ "", -/* write */ ""); - - +ADD_TRANSLATOR (Performer_group_performer, + /* descr */ "", + /* creats*/ "", + /* accepts */ "", + /* acks */ "", + /* reads */ "", + /* write */ ""); void Performer_group_performer::announce_element (Audio_element_info info) @@ -30,7 +28,7 @@ Performer_group_performer::announce_element (Audio_element_info info) Translator *t = context ()->get_parent_context ()->implementation (); - if (Performer_group_performer * eg = dynamic_cast (t)) + if (Performer_group_performer *eg = dynamic_cast (t)) eg->announce_element (info); } @@ -43,9 +41,9 @@ Performer_group_performer::acknowledge_audio_elements () for (SCM p = get_simple_trans_list (); scm_is_pair (p); p = scm_cdr (p)) { - Translator * t = unsmob_translator (scm_car (p)); - Performer * eng = dynamic_cast (t); - if (eng && eng!= info.origin_trans_) + Translator *t = unsmob_translator (scm_car (p)); + Performer *eng = dynamic_cast (t); + if (eng && eng != info.origin_trans_) eng->acknowledge_audio_element (info); } } @@ -59,10 +57,10 @@ Performer_group_performer::do_announces () create_audio_elements (); performer_each (get_simple_trans_list (), &Performer::create_audio_elements); - + if (!announce_infos_.size ()) - break ; - + break; + acknowledge_audio_elements (); announce_infos_.clear (); } @@ -72,13 +70,12 @@ Performer_group_performer::Performer_group_performer () { } - void performer_each (SCM list, Performer_method method) { for (SCM p = list; scm_is_pair (p); p = scm_cdr (p)) { - Performer * e = dynamic_cast(unsmob_translator (scm_car (p))); + Performer *e = dynamic_cast (unsmob_translator (scm_car (p))); if (e) (e->*method) (); }