release: 1.5.29

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

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 430c5f2c8acbbe1286b5b901d8bcdc6a007e130a..1e480870486e62098e0802b44d2e112961c7248e 100644 (file)
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,23 +1,22 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_STAFF_HH
 #define AUDIO_STAFF_HH
 
-#include "proto.hh"
-#include "plist.hh"
+#include "parray.hh"
 #include "lily-proto.hh"
 #include "audio-element.hh"
 
 struct Audio_staff : public Audio_element {
-    void add (Audio_item*  l);
-    void output (Midi_stream& midi_stream_r, int track_i);
+  void add_audio_item (Audio_item*  l);
+  void output (Midi_stream& midi_stream_r, int track_i);
 
-    Link_list<Audio_item*> audio_item_l_list_;
-    DECLARE_MY_RUNTIME_TYPEINFO;
+  Link_array<Audio_item> audio_item_l_arr_;
+  int channel_i_;
 };
 
 #endif // AUDIO_STAFF_HH