X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-staff.cc;h=0e2c8205ba5766845aa66908cd9667575afc8328;hb=054061bf9f0c00f8c2fa45e608bb20a5eb0c5be8;hp=3ca1910abc8f86d290f27383275d0fdc552f941c;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index 3ca1910abc..0e2c8205ba 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,28 +24,27 @@ #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; + Midi_track midi_track (track, port); - Midi_walker i (this, &midi_track, channel); + Midi_walker i (this, &midi_track, start_tick); for (; i.ok (); i++) i.process (); i.finalize (); - + midi_stream.write (midi_track); }