X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=260c5d7154ade8a0996cf7d75807074bc820397e;hb=f68dfcc7aeb65b0b4054edbb2d9861e14d5d533e;hp=2e88c19550bf029bb4562b86ea5e98a37d8cbc15;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index 2e88c19550..260c5d7154 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,32 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-               Jan Nieuwenhuizen <janneke@gnu.org>
- */
-
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
+#include "context.hh"
 #include "performer-group-performer.hh"
 #include "warn.hh"
 
-void 
-Performer::play_element (Audio_element* p) 
-{ 
-  get_daddy_perf ()->play_element (p); 
+void
+Performer::play_element (Audio_element *p)
+{
+  get_daddy_performer ()->play_element (p);
 }
 
 int
 Performer::get_tempo () const
 {
-  return get_daddy_perf ()->get_tempo ();
+  return get_daddy_performer ()->get_tempo ();
 }
 
-Performer_group_performer*
-Performer::get_daddy_perf () const
+Performer_group_performer *
+Performer::get_daddy_performer () const
 {
-  return (daddy_trans_) 
-    ?dynamic_cast<Performer_group_performer *> (daddy_trans_)
-    : 0;
+  return
+    dynamic_cast<Performer_group_performer *> (get_daddy_translator ());
 }
 
 void
@@ -41,11 +40,10 @@ 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);
 }