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 0bffa4e45eb973f5d9037ce3c7a5e0cb46cafa69..1d0fb5ca18d6fb3e64268225393488682de0d569 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.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