Run `make grand-replace'.

[lilypond.git] / lily / audio-staff.cc

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index f89ebd62d4ac712602ac352231089865c28b69ef..73a56d6a62681569975184269b31874baa0bbcb4 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,31 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "audio-staff.hh"
-#include "audio-item.hh"
-#include "midi-item.hh"
+
+#include "midi-chunk.hh"
 #include "midi-stream.hh"
 #include "midi-walker.hh"
 
 void
-Audio_staff::add_audio_item (Audio_item* l)
+Audio_staff::add_audio_item (Audio_item *l)
 {
-  audio_item_l_arr_.push (l);
+  audio_items_.push_back (l);
 }
 
+Audio_staff::Audio_staff ()
+{
+  channel_ = -1; 
+}
 
 void
-Audio_staff::output (Midi_stream& midi_stream_r, int track_i)
+Audio_staff::output (Midi_stream &midi_stream, int channel)
 {
   Midi_track midi_track;
-  midi_track.number_i_ = track_i;
-  midi_track.channel_i_ = channel_i_;
-  for (Midi_walker i (this, &midi_track); i.ok (); i++)
+  midi_track.number_ = channel;
+
+  Midi_walker i (this, &midi_track, channel);
+  for (; i.ok (); i++)
     i.process ();
-  midi_stream_r << midi_track;
-}
 
+  i.finalize ();
+  
+  midi_stream.write (midi_track);
+}