* Another grand 2003 update.

[lilypond.git] / lily / include / score-performer.hh

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 09097470a6bf72495630645ac0870798dedaa749..411cf154722d48acc6f0e5f485b026f647b20952 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,7 +1,7 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -18,11 +18,9 @@ class Score_performer:
   public Performer_group_performer, public Global_translator 
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Score_performer ();
+  TRANSLATOR_DECLARATIONS(Score_performer);
   ~Score_performer ();
-  Performance *performance_p_;
+  Performance *performance_;
 
 protected:
   virtual void finish ();
@@ -31,14 +29,14 @@ protected:
   virtual void start ();
   virtual void initialize ();
   virtual void announce_element (Audio_element_info);
-  virtual int get_tempo_i () const;
+  virtual int get_tempo () const;
   virtual void play_element (Audio_element* p);
-  virtual Music_output *get_output_p ();
+  virtual Music_output *get_output ();
 
 private:
   void header (Midi_stream&);
 
-  Audio_column* audio_column_l_;
+  Audio_column* audio_column_;
 };
 
 #endif // SCORE_PERFORMER_HH