(move_away_from_staffline): new function.

[lilypond.git] / lily / performer.cc

diff --git a/lily/performer.cc b/lily/performer.cc
index 6a949311a1255046eb20922743047d2d4c199c6e..14a4239c1faaf6fb29abdf717634720ffdfd26f6 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,32 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 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); 
+  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::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
@@ -47,5 +46,5 @@ Performer::announce_element (Audio_element_info i)
 {
   if (!i.origin_trans_)
     i.origin_trans_= this;
-  get_daddy_perf ()->announce_element (i);
+  get_daddy_performer ()->announce_element (i);
 }