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

diff --git a/lily/performer.cc b/lily/performer.cc
index 62ac44481e..9d99873989 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,48 +3,37 @@
 
   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 (Audio_element* p) 
-{ 
-  daddy_perf_l ()->play (p); 
-}
-
-int
-Performer::get_tempo_i() const
+Performer_group *
+Performer::get_daddy_performer () const
 {
-  return daddy_perf_l ()->get_tempo_i();
-}
-
-Performer_group_performer*
-Performer::daddy_perf_l () 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);
 }