X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=28726bc7ef1bfa995ae0d1e6d50607870fbb19ff;hb=f5b1f319b1b5b7517972dfebdac2292a99531d67;hp=42d365de00c1f7d0be06395e10c952722f6e5fe3;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index 42d365de00..28726bc7ef 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,32 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 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 "performer-group-performer.hh"
+#include "context.hh"
+#include "performer-group.hh"
 #include "warn.hh"
 
-void 
-Performer::play_element (Audio_element* p) 
-{ 
-  get_daddy_perf ()->play_element (p); 
-}
-
-int
-Performer::get_tempo () const
+void
+Performer::play_element (Audio_element *p)
 {
-  return get_daddy_perf ()->get_tempo ();
+  get_daddy_performer ()->play_element (p);
 }
 
-Performer_group_performer*
-Performer::get_daddy_perf () const
+Performer_group *
+Performer::get_daddy_performer () const
 {
-  return (daddy_trans_) 
-    ?dynamic_cast<Performer_group_performer *> (daddy_trans_)
-    : 0;
+  return
+    dynamic_cast<Performer_group *> (get_daddy_translator ());
 }
 
 void
@@ -41,11 +34,11 @@ Performer::create_audio_elements ()
 {
 }
 
-
 void
 Performer::announce_element (Audio_element_info i)
 {
   if (!i.origin_trans_)
-    i.origin_trans_= this;
-  get_daddy_perf ()->announce_element (i);
+    i.origin_trans_ = this;
+
+  get_daddy_performer ()->announce_element (i);
 }