X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fscore-performer.hh;h=55f31b11231b73546dd9aef65bbcc7f68ded45bc;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b5999c53f69daaeed6308b895f061cecb859ea58;hpb=669494d7e9ab0156a1ebc8804a24f136f551d803;p=lilypond.git

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index b5999c53f6..55f31b1123 100644
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,44 +1,47 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-                 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef SCORE_PERFORMER_HH
 #define SCORE_PERFORMER_HH
 
-#include "performer-group-performer.hh"
-#include "global-translator.hh"
+#include "moment.hh"
+#include "performer-group.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 Performer_group
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Score_performer();
-  ~Score_performer();
-  Performance *performance_p_;
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Score_performer);
+  Performance *performance_;
+
+  ~Score_performer ();
+  Score_performer ();
 
 protected:
-  virtual void finish();
-  virtual void prepare (Moment mom);
-  virtual void one_time_step();
-  virtual void start();
+  DECLARE_LISTENER (finish);
+  DECLARE_LISTENER (prepare);
+  DECLARE_LISTENER (one_time_step);
+
+  /* Engraver_group_engraver interface */
+  virtual void connect_to_context (Context *);
+  virtual void disconnect_from_context ();
   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 void derived_mark () const;
+  virtual void acknowledge_audio_elements ();
 private:
-  void header (Midi_stream&);
+  void header (Midi_stream &);
 
-  Audio_column* audio_column_l_;
+  Audio_column *audio_column_;
+  bool skipping_;
+  Moment skip_start_mom_;
+  Moment offset_mom_;
 };
 
 #endif // SCORE_PERFORMER_HH