Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / performer.cc

diff --git a/lily/performer.cc b/lily/performer.cc
index 205fb3e3532e1cbaf9083f402d48c8213ddb90a0..af896f23dd9ee60938e1337d9bac9b1cb5dc082e 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -3,32 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 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_element (Audio_element* p) 
-{ 
-  daddy_perf_l ()->play_element (p); 
+void
+Performer::play_element (Audio_element *p)
+{
+  get_daddy_performer ()->play_element (p);
 }
 
 int
-Performer::get_tempo_i() const
+Performer::get_tempo () const
 {
-  return daddy_perf_l ()->get_tempo_i();
+  return get_daddy_performer ()->get_tempo ();
 }
 
-Performer_group_performer*
-Performer::daddy_perf_l () const
+Performer_group *
+Performer::get_daddy_performer () const
 {
-  return (daddy_trans_l_) 
-    ?dynamic_cast<Performer_group_performer *> (daddy_trans_l_)
-    : 0;
+  return
+    dynamic_cast<Performer_group *> (get_daddy_translator ());
 }
 
 void
@@ -41,11 +40,11 @@ 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);
 }