Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 89d701b81f526b950357991d86274eca60dcb656..d3e29e80bc72abf9a6b5a38f4377475d9cc041d2 100644 (file)
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,22 +1,25 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
-  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef AUDIO_STAFF_HH
 #define AUDIO_STAFF_HH
 
-#include "proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "audio-element.hh"
 
-struct Audio_staff : public Audio_element {
-  void add_audio_item (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_array<Audio_item> audio_item_l_arr_;
+  Audio_staff ();
+  
+  vector<Audio_item*> audio_items_;
+  int channel_;
 };
 
 #endif // AUDIO_STAFF_HH