Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/performer-group.hh b/lily/include/performer-group.hh
index f1737c52b8a3c13f7b92160e8745a3a309ac0297..1a7d8087d8aba88a4a3fb0a5eb58a3ee8cb52e77 100644 (file)
--- a/lily/include/performer-group.hh
+++ b/lily/include/performer-group.hh
@@ -1,7 +1,7 @@
 /*
   performer-group.hh -- declare Performer_group
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -20,14 +20,10 @@ public:
 
   void do_announces ();
   virtual void announce_element (Audio_element_info);
-  virtual void play_element (Audio_element *p);
-  virtual int get_tempo () const;
 
 protected:
-  Array<Audio_element_info> announce_infos_;
-
-private:
-  void acknowledge_audio_elements ();
+  vector<Audio_element_info> announce_infos_;
+  virtual void acknowledge_audio_elements ();
 };
 
 void performer_each (SCM list, Performer_method method);