patch::: 1.3.62.hwn1

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

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index d3f1997b5e2e7dfefc3a154079766639ed0e4cec..5b6f8d4d8a63740ddb276c74e155cb2b39da38dd 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,38 +1,37 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_COLUMN_HH
 #define AUDIO_COLUMN_HH
 
 #include "proto.hh"
-#include "pcursor.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 (Audio_item* i_l);
-    Moment at_mom() const;
-    void print() const;
+  void add_audio_item (Audio_item* i_l);
+  Moment at_mom() const;
+  void print() const;
 
-    Link_list<Audio_item *> audio_item_l_list_;
-    Performance * performance_l_;
+  Link_array<Audio_item> audio_item_l_arr_;
+  Performance * performance_l_;
 
 private:
-    Audio_column (Audio_column const&);
+  Audio_column (Audio_column const&);
 
-    Moment at_mom_;
+  Moment at_mom_;
 };