X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=942f6f306e6bace2ab592782357fb9cb13911fdc;hb=f47a52d0c0b6f0f2bc39708528ba9cec4882aaa2;hp=6d618346eaf452f11d74c009185584a7449baeca;hpb=98e7b0a30008cfea6e80b69e2d94c41ea4cd0f02;p=lilypond.git diff --git a/lily/performer.cc b/lily/performer.cc index 6d618346ea..942f6f306e 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -7,28 +7,27 @@ Jan Nieuwenhuizen */ - +#include "context.hh" #include "performer-group-performer.hh" #include "warn.hh" void Performer::play_element (Audio_element* p) { - get_daddy_perf ()->play_element (p); + get_daddy_performer ()->play_element (p); } int Performer::get_tempo () const { - return get_daddy_perf ()->get_tempo (); + return get_daddy_performer ()->get_tempo (); } Performer_group_performer* -Performer::get_daddy_perf () const +Performer::get_daddy_performer () const { - return (daddy_trans_) - ?dynamic_cast (daddy_trans_) - : 0; + return + dynamic_cast (get_daddy_translator ()); } void @@ -46,13 +45,6 @@ void Performer::announce_element (Audio_element_info i) { if (!i.origin_trans_) - i.origin_trans_= this; - get_daddy_perf ()->announce_element (i); -} - - -void -Performer::process_music () -{ - + i.origin_trans_ = this; + get_daddy_performer ()->announce_element (i); }