X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformer-group.hh;h=deaa33efcb66b4cec6011239c3d998d635f64bd1;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=07baa64d2dfad044fe6fa699211995daa5182e28;hpb=0eb7d103fae1508384b1918069f9b6ef16fe5837;p=lilypond.git

diff --git a/lily/include/performer-group.hh b/lily/include/performer-group.hh
index 07baa64d2d..deaa33efcb 100644
--- a/lily/include/performer-group.hh
+++ b/lily/include/performer-group.hh
@@ -1,36 +1,44 @@
 /*
-  performer-group-performer.hh -- declare Performer_group
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1996--2014 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 PERFORMER_GROUP_PERFORMER_HH
-#define PERFORMER_GROUP_PERFORMER_HH
+#ifndef PERFORMER_GROUP_HH
+#define PERFORMER_GROUP_HH
 
 #include "performer.hh"
 #include "translator-group.hh"
 
 typedef void (Performer:: *Performer_method) (void);
 
-class Performer_group : public virtual Translator_group
+class Performer_group : public Translator_group
 {
 public:
   VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group);
 
   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);
 
-#endif // PERFORMER_GROUP_PERFORMER_HH
-
+#endif /* PERFORMER_GROUP_HH */