X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=7add5ba193149b478ba252f285cfe89032f66f30;hb=0ffff1268af37ea5a5d3123976e83a81ad7e61f7;hp=7e18cfe0e0f92977967d842f095102e156cb9c13;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index 7e18cfe0e0..7add5ba193 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,49 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-               Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2007 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); 
-}
-
-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_grob (Audio_element_info)
+Performer::acknowledge_audio_element (Audio_element_info)
 {
 }
 
 void
-Performer::create_grobs ()
+Performer::create_audio_elements ()
 {
 }
 
-
 void
 Performer::announce_element (Audio_element_info i)
 {
-  if (!i.origin_trans_l_)
-    i.origin_trans_l_= this;
-  daddy_perf_l()->announce_element (i);
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
+
+  get_daddy_performer ()->announce_element (i);
 }