2003 -> 2004

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

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 289f6948286080592f114b1a511977bf2334f8c5..d7dc38bb8c3179348989b9318cf3354bb6caf11d 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,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -18,27 +18,25 @@ class Score_performer:
   public Performer_group_performer, public Global_translator 
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Score_performer();
-  ~Score_performer();
-  Performance *performance_p_;
+  TRANSLATOR_DECLARATIONS(Score_performer);
+  ~Score_performer ();
+  Performance *performance_;
 
 protected:
-  virtual void finish();
+  virtual void finish ();
   virtual void prepare (Moment mom);
-  virtual void process();
-  virtual void start();
-  virtual void do_add_processing ();
+  virtual void one_time_step ();
+  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