* lily/parser.yy (command_element): reverse setting of

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

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 733fb86fef296f252431aaa2688baa9547c023d0..843b65679702ed1b0034d1f2fef4c974e9e4794f 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -9,34 +9,31 @@
 #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 
+class Score_performer : public Score_translator, public virtual Performer_group_performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Score_performer);
+  ~Score_performer ();
+  Performance *performance_;
   
-  Score_performer();
-  ~Score_performer();
-  Performance *performance_p_;
-
 protected:
-  virtual void finish();
   virtual void prepare (Moment mom);
-  virtual void process();
-  virtual void start();
-  virtual void do_add_processing ();
-  virtual int get_tempo_i() const;
-  virtual void play (Audio_element* p);
-  virtual Music_output *get_output_p ();
+  virtual void finish ();
+  virtual void one_time_step ();
+  virtual void initialize ();
+  virtual void announce_element (Audio_element_info);
+  virtual int get_tempo () const;
+  virtual void play_element (Audio_element* p);
+  virtual Music_output *get_output ();
 private:
   void header (Midi_stream&);
 
-  Audio_column* audio_column_l_;
+  Audio_column* audio_column_;
 };
 
 #endif // SCORE_PERFORMER_HH