Merge branch 'master' into lilypond/translation

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

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index d2a2baeba32fd336b87330d5126e7f565b4ff063..cdce0298fe7122cca7e774e0ae38f47bc3966b4e 100644 (file)
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,7 +1,7 @@
 /*
   audio-staff.hh -- declare Audio_staff
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef AUDIO_STAFF_HH
@@ -14,9 +14,11 @@
 struct Audio_staff : public Audio_element
 {
   void add_audio_item (Audio_item *l);
-  void output (Midi_stream &midi_stream_r, int track_i);
+  void output (Midi_stream &midi_stream_r, int track);
 
-  Link_array__Audio_item_ audio_items_;
+  Audio_staff ();
+  
+  vector<Audio_item*> audio_items_;
   int channel_;
 };