X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-performer.hh;h=b77890c08c4dfb0f458599e957eb2c7278f8b5dd;hb=43600104d4f9a82f744e9bc4da8d4a0cb69047f9;hp=953127e1328d925e6e8c45f0d53da16cd4a26896;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 953127e132..b77890c08c 100644
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,41 +1,47 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2009 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 "score-translator.hh"
+#include "moment.hh"
+#include "performer-group.hh"
 
 /**
    Top level performer. Completely takes care of MIDI output
 */
-class Score_performer : public Score_translator, public virtual Performer_group_performer
+class Score_performer : public Performer_group
 {
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group,Score_performer);
-  ~Score_performer ();
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Score_performer);
   Performance *performance_;
 
+  ~Score_performer ();
   Score_performer ();
+
 protected:
-  virtual void prepare (Moment mom);
-  virtual void finish ();
-  virtual void one_time_step ();
+  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 () const;
-  virtual void play_element (Audio_element *p);
-  virtual SCM get_output ();
   virtual void derived_mark () const;
+  virtual void acknowledge_audio_elements ();
 private:
   void header (Midi_stream &);
 
   Audio_column *audio_column_;
+  bool skipping_;
+  Moment skip_start_mom_;
+  Moment offset_mom_;
 };
 
 #endif // SCORE_PERFORMER_HH