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

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 430c5f2c8a..86e6d4748f 100644
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,23 +1,25 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef AUDIO_STAFF_HH
 #define AUDIO_STAFF_HH
 
-#include "proto.hh"
-#include "plist.hh"
+#include "std-vector.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);
+struct Audio_staff : public Audio_element
+{
+  void add_audio_item (Audio_item *l);
+  void output (Midi_stream &midi_stream_r, int track);
 
-    Link_list<Audio_item*> audio_item_l_list_;
-    DECLARE_MY_RUNTIME_TYPEINFO;
+  Audio_staff ();
+  
+  vector<Audio_item*> audio_items_;
+  int channel_;
 };
 
 #endif // AUDIO_STAFF_HH