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 4a79cb1fb4fe3a4b12a229b2861365d3f5343750..e38f430c62ed679415addf4cb6f5020876d1225f 100644 (file)
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,45 +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"
 
-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();
+  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 Moment get_mom() const;
-    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_event(Midi_item*);
+  virtual void prepare (Moment mom);
+  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&);
-
-    Midi_def* midi_l_;
-
-    Moment prev_mom_;
-    Moment now_mom_;
+  void header (Midi_stream &);
 
-    Link_array<Midi_item> midi_item_p_arr_;
+  Audio_column *audio_column_;
+  bool skipping_;
+  Moment skip_start_mom_;
+  Moment offset_mom_;
 };
 
 #endif // SCORE_PERFORMER_HH