X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=1877464f4546ee1a8f7c7937a1f63faaa7d4c264;hb=9352789b729682d683482c2852cc7b53e9dcdc70;hp=b7508b8c2559374a849dd5b27a7c25726ada7145;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index b7508b8c25..1877464f45 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -1,31 +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--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2005 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 (ai);
+}
+
+Audio_staff::Audio_staff ()
+  : percussion_ (false), merge_unisons_ (false)
 {
-  audio_items_.push (l);
 }
 
 void
-Audio_staff::output (Midi_stream &midi_stream_r, int track_i)
+Audio_staff::output (Midi_stream &midi_stream, int track, bool port)
 {
-  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 midi_track (track, port);
+
+  Midi_walker i (this, &midi_track);
+  for (; i.ok (); i++)
     i.process ();
-  midi_stream_r << midi_track;
+
+  i.finalize ();
+
+  midi_stream.write (midi_track);
 }