2003 -> 2004

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

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index fe9ecaf9f4478f09d6fa23f57c1d1d4e1a40d60e..a233fa3f8b53f186fa21767e868f576b69176e1e 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "audio-staff.hh"
@@ -15,7 +15,7 @@
 void
 Audio_staff::add_audio_item (Audio_item* l)
 {
-  audio_item_l_arr_.push (l);
+  audio_items_.push (l);
 }
 
 
@@ -23,9 +23,10 @@ void
 Audio_staff::output (Midi_stream& midi_stream_r, int track_i)
 {
   Midi_track midi_track;
-  midi_track.number_i_ =  track_i;
-  for (Midi_walker i (this, &midi_track); i.ok(); i++)
-    i.process();
+  midi_track.number_ = track_i;
+  midi_track.channel_ = channel_;
+  for (Midi_walker i (this, &midi_track); i.ok (); i++)
+    i.process ();
   midi_stream_r << midi_track;
 }