X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=0e2c8205ba5766845aa66908cd9667575afc8328;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=7ddd646b53c7dd7e317594b7faa6d7854582fe20;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 7ddd646b53..0e2c8205ba 100644
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -1,37 +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--2015 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), merge_unisons_ (false)
 {
-  channel_ = -1; 
 }
 
 void
-Audio_staff::output (Midi_stream &midi_stream, int channel)
+Audio_staff::output (Midi_stream &midi_stream, int track, bool port, int start_tick)
 {
-  Midi_track midi_track;
-  midi_track.number_ = channel;
-  
-  for (Midi_walker i (this, &midi_track, channel); i.ok (); i++)
+  Midi_track midi_track (track, port);
+
+  Midi_walker i (this, &midi_track, start_tick);
+  for (; i.ok (); i++)
     i.process ();
-  
-  midi_stream << midi_track;
+
+  i.finalize ();
+
+  midi_stream.write (midi_track);
 }