Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 18df5c9cb697b9eb90a415465e056c62e04bd0fc..1616ceb3c83cb9354f6c3226b194948f792f43d5 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -15,18 +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, int track)
+Audio_staff::output (Midi_stream &midi_stream, int channel)
 {
   Midi_track midi_track;
-  midi_track.number_ = track;
-  midi_track.channel_ = channel_;
+  midi_track.number_ = channel;
   
-  for (Midi_walker i (this, &midi_track); i.ok (); i++)
+  for (Midi_walker i (this, &midi_track, channel); i.ok (); i++)
     i.process ();
+  
   midi_stream << midi_track;
 }