source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+ (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
#include "audio-staff.hh"
-#include "audio-item.hh"
-#include "midi-item.hh"
+
+#include "midi-chunk.hh"
#include "midi-stream.hh"
#include "midi-walker.hh"
void
-Audio_staff::add_audio_item (Audio_item* l)
+Audio_staff::add_audio_item (Audio_item *l)
{
- audio_item_l_arr_.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_i_ = track_i;
- for (Midi_walker i (this, &midi_track); i.ok (); i++)
+ midi_track.number_ = channel;
+
+ Midi_walker i (this, &midi_track, channel);
+ for (; i.ok (); i++)
i.process ();
- midi_stream_r << midi_track;
-}
+ i.finalize ();
+
+ midi_stream.write (midi_track);
+}