X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-column.hh;h=06ba4b0ec74ca1aa5132646858c028d33d218645;hb=f0968255554403de5d86b7e6efff5e644cba7f7a;hp=6065e43a68c2d5783496f640d21cfae7a3ff4d11;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 6065e43a68..06ba4b0ec7 100644
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,37 +1,34 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2004 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 "parray.hh"
+#include "audio-element.hh"
 
 /**
     generic audio grouped vertically.
  */
 
-class Audio_column { 
+class Audio_column : public Audio_element  { 
 public:
-    Audio_column (Moment at_mom);
+  Audio_column (Moment at_mom);
 
-    void add (Audio_item* i_l);
-    Moment at_mom() const;
-    void print() const;
+  void add_audio_item (Audio_item* i);
+  Moment at_mom () const;
 
-    Link_list<Audio_item *> audio_item_l_list_;
-    Performance * performance_l_;
+  Link_array<Audio_item> audio_items_;
 
 private:
-    Audio_column (Audio_column const&);
+  Audio_column (Audio_column const&);
 
-    Moment at_mom_;
+  Moment at_mom_;
 };