X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-column.hh;h=fa7654d86f22d39b379034861b5716d00b06fb0d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b5f09403f87449591729a277ddfad90dbee6b81d;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index b5f09403f8..fa7654d86f 100644
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,38 +1,36 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef AUDIO_COLUMN_HH
 #define AUDIO_COLUMN_HH
 
-#include "proto.hh"
-#include "plist.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
-
+#include "std-vector.hh"
+#include "audio-element.hh"
 
 /**
-    generic audio grouped vertically.
- */
+   generic audio grouped vertically.
+*/
 
-class Audio_column { 
+class Audio_column : public Audio_element
+{
 public:
-    Audio_column (Moment at_mom);
-
-    void add (Audio_item* i_l);
-    Moment at_mom() const;
-    void print() const;
+  Audio_column (Moment when);
 
-    Link_list<Audio_item *> audio_item_l_list_;
-    Audio_score * audio_score_l_;
+  void add_audio_item (Audio_item *i);
+  Moment when () const;
 
-private:
-    Audio_column (Audio_column const&);
+  vector<Audio_item*> audio_items_;
+  Moment when_;
+  int ticks () const ;
+protected:
+  void offset_when (Moment m);
+  friend class Score_performer;
 
-    Moment at_mom_;
 };
 
-
 #endif // AUDIO_COLUMN_HH