X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=e59d5f17229f0277c962a8edc07567ead30657bb;hb=af366cb65538eb1629f2286aebc9d298e0d986b6;hp=199657677c0d4943ec061d15f0b618d4d5b2a23c;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 199657677c..e59d5f1722 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -1,31 +1,51 @@
 /*
-  audio-staff.cc -- implement Audio_staff
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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* l)
+Audio_staff::add_audio_item (Audio_item *l)
+{
+  audio_items_.push_back (l);
+}
+
+Audio_staff::Audio_staff ()
 {
-  audio_item_l_list_.bottom().add (l);
+  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++)
-	i.process();
-  midi_stream_r << midi_track;
+  midi_track.number_ = channel;
+
+  Midi_walker i (this, &midi_track, channel);
+  for (; i.ok (); i++)
+    i.process ();
+
+  i.finalize ();
+  
+  midi_stream.write (midi_track);
 }
 
-IMPLEMENT_IS_TYPE_B1(Audio_staff, Audio_element);