X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=af896f23dd9ee60938e1337d9bac9b1cb5dc082e;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=f0cd2585e22887666b0c957aa744075ec3cef678;hpb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index f0cd2585e2..af896f23dd 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,48 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-               Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
+#include "context.hh"
+#include "performer-group.hh"
+#include "warn.hh"
 
-#include "performer-group-performer.hh"
-#include "debug.hh"
-
-void 
-Performer::play_element (Audio_element* p) 
-{ 
-  daddy_perf_l ()->play_element (p); 
+void
+Performer::play_element (Audio_element *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_group *
+Performer::get_daddy_performer () const
 {
-  return (daddy_trans_l_) 
-    ?dynamic_cast<Performer_group_performer *> (daddy_trans_l_)
-    : 0;
+  return
+    dynamic_cast<Performer_group *> (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 ()
 {
 }
 
-
 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);
 }