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 2638962d83d726793790329fc17e76ce759276e5..e38f430c62ed679415addf4cb6f5020876d1225f 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,44 +1,45 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (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 "global-translator.hh"
+#include "performer-group.hh"
+#include "score-translator.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 Score_translator,
+                       public virtual Performer_group
 {
 public:
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Score_performer();
-  ~Score_performer();
-  Audio_score *performance_p_;
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Score_performer);
+  ~Score_performer ();
+  Performance *performance_;
 
+  Score_performer ();
 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 start();
-  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 SCM get_output ();
+  virtual void derived_mark () const;
 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