X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-performer.hh;h=5830953aff5a0b22d8a5960688c107014c5bc842;hb=0dcde4fc13c8091439fb8e2d77ea755357a0e7ed;hp=953127e1328d925e6e8c45f0d53da16cd4a26896;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh
index 953127e132..5830953aff 100644
--- a/lily/include/score-performer.hh
+++ b/lily/include/score-performer.hh
@@ -1,41 +1,60 @@
 /*
-  score-performer.hh -- declare Score_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SCORE_PERFORMER_HH
 #define SCORE_PERFORMER_HH
 
-#include "performer-group-performer.hh"
-#include "score-translator.hh"
+#include "moment.hh"
+#include "performer-group.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 Performer_group
 {
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group,Score_performer);
-  ~Score_performer ();
+  DECLARE_CLASSNAME (Score_performer);
   Performance *performance_;
 
+  ~Score_performer ();
   Score_performer ();
+
 protected:
-  virtual void prepare (Moment mom);
-  virtual void finish ();
-  virtual void one_time_step ();
+  void finish (SCM);
+  void prepare (SCM);
+  void one_time_step (SCM);
+
+  /* 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 int get_tempo () const;
-  virtual void play_element (Audio_element *p);
-  virtual SCM get_output ();
   virtual void derived_mark () const;
+  virtual void acknowledge_audio_elements ();
 private:
   void header (Midi_stream &);
 
   Audio_column *audio_column_;
+  bool skipping_;
+  Moment skip_start_mom_;
+  Moment offset_mom_;
 };
 
 #endif // SCORE_PERFORMER_HH