* gcc-3.4 snapshot: 3.4.0 20040215 (prerelease) compile fixes, and

[lilypond.git] / lily / include / performer.hh

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index b5257984aa5f6c641a710d8e0d83679d55d73d1b..40e5695f597d62e309ed05d711cc4afe58802a71 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,7 +1,7 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -10,29 +10,27 @@
 
 #include "audio-element-info.hh"
 #include "array.hh"
-#include "request.hh"
+#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
-/**
-  Convert a music definition into a audio representation.
-  A baseclass
- */
+/* Convert a music definition into a audio representation.
+   A baseclass.  */
 class Performer : public virtual Translator
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONSTRUCTOR (Translator, Performer);
   friend class Performer_group_performer;  
-  Performer_group_performer* daddy_perf_l() const;
+  Performer_group_performer* get_daddy_performer () const;
 
 protected:
   virtual void announce_element (Audio_element_info);
   virtual void acknowledge_audio_element (Audio_element_info);
   virtual void create_audio_elements ();
-  virtual int get_tempo_i() const;
-  virtual void play_element (Audio_element * elem_p );
+  virtual int get_tempo () const;
+  virtual void play_element (Audio_element * elem );
 };
 
 
-#endif // PERFORMER_HH
+#endif /* PERFORMER_HH */