X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=8de47bf9dea59b051ea6bb4f6b0256aecc3b0422;hb=8cd1548d4177af5d2ca386a4574ce9cbdc97aa96;hp=6871ab56b442ad8b6275d5bd227f4d3f9688fdb1;hpb=7c6bba557e7d5ab6b32d7cd17c947e76cb1c1172;p=lilypond.git

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 6871ab56b4..8de47bf9de 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -1,38 +1,50 @@
 /*
-  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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  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 "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 *ai)
 {
-  audio_items_.push_back (l);
+  audio_items_.push_back (ai);
 }
 
 Audio_staff::Audio_staff ()
+  : percussion_ (false)
 {
-  channel_ = -1; 
 }
 
 void
-Audio_staff::output (Midi_stream &midi_stream, int channel)
+Audio_staff::output (Midi_stream &midi_stream, int track)
 {
-  Midi_track midi_track;
-  midi_track.number_ = channel;
+  Midi_track midi_track (track);
 
-  Midi_walker i (this, &midi_track, channel);
+  Midi_walker i (this, &midi_track);
   for (; i.ok (); i++)
     i.process ();
+
+  i.finalize ();
   
-  midi_stream << midi_track;
+  midi_stream.write (midi_track);
 }