Run `make grand-replace'.

[lilypond.git] / lily / include / audio-column.hh

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 18f51d5bfba764c270cfacb68c7dc6a53586efdb..fa7654d86f22d39b379034861b5716d00b06fb0d 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,38 +1,36 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef AUDIO_COLUMN_HH
 #define AUDIO_COLUMN_HH
 
-#include "flower-proto.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "audio-element.hh"
 
 /**
-    generic audio grouped vertically.
- */
+   generic audio grouped vertically.
+*/
 
-class Audio_column : public Audio_element  { 
+class Audio_column : public Audio_element
+{
 public:
-  Audio_column (Moment at_mom);
+  Audio_column (Moment when);
 
-  void add_audio_item (Audio_item* i);
-  Moment at_mom () const;
-  void print () const;
+  void add_audio_item (Audio_item *i);
+  Moment when () const;
 
-  Link_array<Audio_item> audio_items_;
-  Performance * performance_;
+  vector<Audio_item*> audio_items_;
+  Moment when_;
+  int ticks () const ;
+protected:
+  void offset_when (Moment m);
+  friend class Score_performer;
 
-private:
-  Audio_column (Audio_column const&);
-
-  Moment at_mom_;
 };
 
-
 #endif // AUDIO_COLUMN_HH