X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-performer.hh;h=826abeec95b8c0ec8f314e6e6903da3182508637;hb=f29496200848f78721deacd908ff4bb3262e55d6;hp=1a56148425cb3c971313ece2bd041ecfa007628e;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 1a56148425..826abeec95 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, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2007 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:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Score_performer();
-    ~Score_performer();
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Score_performer);
+  Performance *performance_;
 
-protected:
-    virtual Translator* ancestor_l (int l);
-    virtual int depth_i() const;
-
-    virtual void finish();
-    virtual void prepare (Moment mom);
-    virtual void process();
-    virtual void set_score (Score* score_l);
-    virtual void start();
-    virtual int get_tempo_i() const;
-    virtual void play (Audio_element* p);
+  ~Score_performer ();
+  Score_performer ();
 
+protected:
+  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 void derived_mark () const;
+  virtual void acknowledge_audio_elements ();
 private:
-    void header (Midi_stream&);
+  void header (Midi_stream &);
 
-    Moment now_mom_;
-    Audio_column* audio_column_l_;
+  Audio_column *audio_column_;
+  bool skipping_;
+  Moment skip_start_mom_;
+  Moment offset_mom_;
 };
 
 #endif // SCORE_PERFORMER_HH