X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=9d99873989e8755c5bc3d72c115f0c050327d234;hb=bf689da6077e742f9f3827bf03e732b48072c5f2;hp=2e88c19550bf029bb4562b86ea5e98a37d8cbc15;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/performer.cc b/lily/performer.cc index 2e88c19550..9d99873989 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -3,32 +3,20 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys - Jan Nieuwenhuizen - */ + (c) 1996--2006 Han-Wen Nienhuys + Jan Nieuwenhuizen +*/ - -#include "performer-group-performer.hh" +#include "context.hh" +#include "performer-group.hh" #include "warn.hh" -void -Performer::play_element (Audio_element* p) -{ - get_daddy_perf ()->play_element (p); -} -int -Performer::get_tempo () const +Performer_group * +Performer::get_daddy_performer () const { - return get_daddy_perf ()->get_tempo (); -} - -Performer_group_performer* -Performer::get_daddy_perf () const -{ - return (daddy_trans_) - ?dynamic_cast (daddy_trans_) - : 0; + return + dynamic_cast (get_daddy_translator ()); } void @@ -41,11 +29,11 @@ Performer::create_audio_elements () { } - void Performer::announce_element (Audio_element_info i) { if (!i.origin_trans_) - i.origin_trans_= this; - get_daddy_perf ()->announce_element (i); + i.origin_trans_ = this; + + get_daddy_performer ()->announce_element (i); }