X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=1616ceb3c83cb9354f6c3226b194948f792f43d5;hb=ce593a5d9614d463ac0255eac17ceb50ce3bcc29;hp=b7508b8c2559374a849dd5b27a7c25726ada7145;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index b7508b8c25..1616ceb3c8 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-staff.hh"
@@ -15,17 +15,23 @@
 void
 Audio_staff::add_audio_item (Audio_item *l)
 {
-  audio_items_.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_ = track_i;
-  midi_track.channel_ = channel_;
-  for (Midi_walker i (this, &midi_track); i.ok (); i++)
+  midi_track.number_ = channel;
+  
+  for (Midi_walker i (this, &midi_track, channel); i.ok (); i++)
     i.process ();
-  midi_stream_r << midi_track;
+  
+  midi_stream << midi_track;
 }