X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformer.hh;h=82b4ce50cc2b66bf04e228ebc74aacd476ce64f4;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=eda9b784f39fa3d460b18dc7020fc7cd9aa5750d;hpb=bdabe71a2bdda41b64c0000da6023771701f4def;p=lilypond.git

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index eda9b784f3..82b4ce50cc 100644
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,58 +1,50 @@
 /*
-  performer.hh -- declare Performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-#ifndef PERFORMER_HH
-#define PERFORMER_HH
-
-#include "lily-proto.hh"
-#include "varray.hh"
-#include "request.hh"
-#include "score-elem-info.hh"
-#include "staff-info.hh"
-
-/**
-  Convert a music definition into a audio representation.
-  A baseclass
- */
-class Performer {
-    bool init_b_;
-public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Performer_group_performer* daddy_perf_l_;
+  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.
 
-    Performer();
-    virtual ~Performer();
+  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.
 
-    
-    void print() const;
-    virtual void process_requests();
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-    virtual void set( Moment mom );
-    // <ugh>
-    virtual void set_track( int& track_i_r );
-    virtual int get_track_i() const;
-    // </ugh>
+#ifndef PERFORMER_HH
+#define PERFORMER_HH
 
-    virtual bool try_request( Request* req_l );
+#include "audio-element-info.hh"
+#include "grob-info.hh"
+#include "translator.hh"
 
-    virtual void do_removal_processing();
-    void creation_processing();
+/* Convert a music definition into an audio representation.
+   A baseclass.  */
+class Performer : public Translator
+{
+public:
+  VIRTUAL_COPY_CONSTRUCTOR (Translator, Performer);
+  friend class Performer_group;
+  Performer_group *get_daddy_performer () const;
+  static Performer *unsmob (SCM perf) {
+    return dynamic_cast <Performer *> (Translator::unsmob (perf));
+  }
+  static bool is_smob (SCM perf) {
+    return Translator::is_smob (perf) && unsmob (perf);
+  }
 
 protected:
-    virtual void do_creation_processing();
-
-    virtual bool do_try_request(Request*);
-    virtual int get_tempo_i() const;
-    virtual void do_print() const;
-    virtual Moment get_mom() const;
-    virtual void play( Audio_item* p );
-    virtual void play( Midi_item* l );
+  virtual void announce_element (Audio_element_info);
+  virtual void acknowledge_audio_element (Audio_element_info);
+  virtual void create_audio_elements ();
 };
 
-#include "global-performers.hh"
+#endif /* PERFORMER_HH */
 
-#endif // PERFORMER_HH