Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 6dc14d11809e744896848aba5230ab3284c54252..a715cbc1de0ae906711deb7ce5ae1092c2b79860 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,29 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "audio-staff.hh"
-#include "audio-item.hh"
+
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "midi-walker.hh"
 
 void
-Audio_staff::add (Audio_item* l)
+Audio_staff::add_audio_item (Audio_item *l)
 {
-  audio_item_l_list_.bottom().add (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 track)
 {
   Midi_track midi_track;
-  midi_track.number_i_ =  track_i;
-  for (Midi_walker i (this, &midi_track); i.ok(); i++)
-    i.process();
-  midi_stream_r << midi_track;
+  midi_track.number_ = track;
+  midi_track.channel_ = channel_;
+  
+  for (Midi_walker i (this, &midi_track); i.ok (); i++)
+    i.process ();
+  midi_stream << midi_track;
 }
 
-IMPLEMENT_IS_TYPE_B1(Audio_staff, Audio_element);