X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=353a26f270e272a2afc8c57389687b2686db941b;hb=c48b83513ad53097baaf937ad278db32b3d362d8;hp=5d402febf585c279248d46676b2232b7ab95a17f;hpb=6d37e68b8d93284b8ce8a17975fe3ac482a02f2d;p=lilypond.git

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 5d402febf5..353a26f270 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-staff.hh"
 
-#include "midi-item.hh"
+#include "midi-chunk.hh"
 #include "midi-stream.hh"
 #include "midi-walker.hh"
 
@@ -18,15 +18,23 @@ Audio_staff::add_audio_item (Audio_item *l)
   audio_items_.push_back (l);
 }
 
+Audio_staff::Audio_staff ()
+{
+  channel_ = -1; 
+}
+
 void
 Audio_staff::output (Midi_stream &midi_stream, int channel)
 {
   Midi_track midi_track;
   midi_track.number_ = channel;
-  
-  for (Midi_walker i (this, &midi_track, channel); i.ok (); i++)
+
+  Midi_walker i (this, &midi_track, channel);
+  for (; i.ok (); i++)
     i.process ();
+
+  i.finalize ();
   
-  midi_stream << midi_track;
+  midi_stream.write (midi_track);
 }