X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=14a4239c1faaf6fb29abdf717634720ffdfd26f6;hb=c3214d7d27899529e67f9e57850167775eaf675d;hp=62ac44481e8a3c99732d828c389864033ececb87;hpb=34f168ae4ed3379964f4009e4a823a7114dcb71a;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index 62ac44481e..14a4239c1f 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,41 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-
+#include "context.hh"
 #include "performer-group-performer.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 void 
-Performer::play (Audio_element* p) 
+Performer::play_element (Audio_element* p) 
 { 
-  daddy_perf_l ()->play (p); 
+  get_daddy_performer ()->play_element (p); 
 }
 
 int
-Performer::get_tempo_i() const
+Performer::get_tempo () const
 {
-  return daddy_perf_l ()->get_tempo_i();
+  return get_daddy_performer ()->get_tempo ();
 }
 
 Performer_group_performer*
-Performer::daddy_perf_l () const
+Performer::get_daddy_performer () const
 {
-  return (daddy_trans_l_) 
-    ?dynamic_cast<Performer_group_performer *> (daddy_trans_l_)
-    : 0;
+  return
+    dynamic_cast<Performer_group_performer *> (get_daddy_translator ());
 }
 
 void
-Performer::acknowledge_element (Audio_element_info)
+Performer::acknowledge_audio_element (Audio_element_info)
 {
 }
 
 void
-Performer::process_acknowledged ()
+Performer::create_audio_elements ()
 {
 }
 
@@ -45,6 +44,7 @@ Performer::process_acknowledged ()
 void
 Performer::announce_element (Audio_element_info i)
 {
-  i.origin_trans_l_arr_.push (this);
-  daddy_perf_l()->announce_element (i);
+  if (!i.origin_trans_)
+    i.origin_trans_= this;
+  get_daddy_performer ()->announce_element (i);
 }