Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 9c36525db8d2aab79c8f47be8c654fe05ad045bb..e38f430c62ed679415addf4cb6f5020876d1225f 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,26 +1,28 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 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 "performer-group.hh"
 #include "score-translator.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 Score_translator,
+                       public virtual Performer_group
 {
 public:
-  TRANSLATOR_DECLARATIONS (Score_performer);
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Score_performer);
   ~Score_performer ();
   Performance *performance_;
 
+  Score_performer ();
 protected:
   virtual void prepare (Moment mom);
   virtual void finish ();
@@ -29,11 +31,15 @@ protected:
   virtual void announce_element (Audio_element_info);
   virtual int get_tempo () const;
   virtual void play_element (Audio_element *p);
-  virtual Music_output *get_output ();
+  virtual SCM get_output ();
+  virtual void derived_mark () const;
 private:
   void header (Midi_stream &);
 
   Audio_column *audio_column_;
+  bool skipping_;
+  Moment skip_start_mom_;
+  Moment offset_mom_;
 };
 
 #endif // SCORE_PERFORMER_HH