* flower

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

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 792ab2d886e5d8835bc20ebef0a676b1ceb3d0ec..9c36525db8d2aab79c8f47be8c654fe05ad045bb 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,42 +1,39 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (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>
+*/
 
 #ifndef SCORE_PERFORMER_HH
 #define SCORE_PERFORMER_HH
 
 #include "performer-group-performer.hh"
-#include "global-translator.hh"
+#include "score-translator.hh"
 
 /**
-  Top level performer. Completely takes care of MIDI output
- */
-class Score_performer: 
-  public Performer_group_performer, public Global_translator 
+   Top level performer. Completely takes care of MIDI output
+*/
+class Score_performer : public Score_translator, public virtual Performer_group_performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Score_performer);
+  TRANSLATOR_DECLARATIONS (Score_performer);
   ~Score_performer ();
-  Performance *performance_p_;
+  Performance *performance_;
 
 protected:
-  virtual void finish ();
   virtual void prepare (Moment mom);
+  virtual void finish ();
   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 void play_element (Audio_element* p);
-  virtual Music_output *get_output_p ();
-
+  virtual int get_tempo () const;
+  virtual void play_element (Audio_element *p);
+  virtual Music_output *get_output ();
 private:
-  void header (Midi_stream&);
+  void header (Midi_stream &);
 
-  Audio_column* audio_column_l_;
+  Audio_column *audio_column_;
 };
 
 #endif // SCORE_PERFORMER_HH