The last commit was an accident. Revert 3 files that shouldn't have been

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

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 7c3c944a289d11db6cd8ef406c6bc72308eff1e9..5d402febf585c279248d46676b2232b7ab95a17f 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,8 +3,8 @@
 
   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"
 
@@ -13,21 +13,20 @@
 #include "midi-walker.hh"
 
 void
-Audio_staff::add_audio_item (Audio_item* l)
+Audio_staff::add_audio_item (Audio_item *l)
 {
-  audio_items_.push (l);
+  audio_items_.push_back (l);
 }
 
-
 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;
 }
 
-