X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-performer.hh;h=843b65679702ed1b0034d1f2fef4c974e9e4794f;hb=4a964b10c411827584eb720c63cd0d6fc5b65d72;hp=769edecec772bc96f08318112e60f503d6ce9621;hpb=48bdd9154a32245a075494b403639181615864e2;p=lilypond.git

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 769edecec7..843b656797 100644
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,45 +1,39 @@
 /*
   score-performer.hh -- declare Score_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef SCORE_PERFORMER_HH
 #define SCORE_PERFORMER_HH
 
 #include "performer-group-performer.hh"
-#include "global-translator.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_performer
 {
 public:
-    NAME_MEMBERS();
-    Score_performer();
-    ~Score_performer();
-
+  TRANSLATOR_DECLARATIONS(Score_performer);
+  ~Score_performer ();
+  Performance *performance_;
+  
 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 Music_output *get_output ();
 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_;
 };
 
 #endif // SCORE_PERFORMER_HH