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

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

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 3f99af98d6c4974db201f307523e4ad73ff43c4b..1d0fb5ca18d6fb3e64268225393488682de0d569 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,7 +1,7 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 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,21 @@
 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_;
+
+protected:
+  void offset_when (Moment m);
+  friend class Score_performer;
 
 private:
   Audio_column (Audio_column const &);
 
-  Moment at_mom_;
+  Moment when_;
 };
 
 #endif // AUDIO_COLUMN_HH