X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-column.hh;h=60cc824aa34365648578acf30256ade5369a4b3b;hb=789d65a45b89c1fe7ec8ee4e80cca8a687274ea7;hp=3e514f0d3e1767ad238acfebe8b8bf7090a2a4b7;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 3e514f0d3e..60cc824aa3 100644
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,7 +1,7 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_COLUMN_HH
@@ -9,7 +9,7 @@
 
 #include "lily-proto.hh"
 #include "moment.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "audio-element.hh"
 
 /**
@@ -19,17 +19,18 @@
 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;
+  Moment when () const;
 
-  Link_array<Audio_item> audio_items_;
+  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