X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=4e19544d41823b6e21a5e0003d0a6616641a4745;hb=bdd8f85f175a105f83d082a24f838b35c935709b;hp=b07c8604cfde4c445f1fc1259d64e3c181cab29f;hpb=e5380f29f23e204a603f8398368d2a7dc0260aa0;p=lilypond.git diff --git a/lily/performance.cc b/lily/performance.cc index b07c8604cf..4e19544d41 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2012 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 @@ -34,9 +34,10 @@ using namespace std; #include "string-convert.hh" #include "warn.hh" -Performance::Performance () +Performance::Performance (bool ports) + : midi_ (0), + ports_ (ports) { - midi_ = 0; } Performance::~Performance () @@ -50,17 +51,14 @@ Performance::output (Midi_stream &midi_stream) const int tracks_ = audio_staffs_.size (); midi_stream.write (Midi_header (1, tracks_, 384)); - if (be_verbose_global) - progress_indication (_ ("Track...") + " "); - + debug_output (_ ("Track...") + " ", false); + for (vsize i = 0; i < audio_staffs_.size (); i++) { Audio_staff *s = audio_staffs_[i]; - if (be_verbose_global) - progress_indication ("[" + to_string (i)); - s->output (midi_stream, i); - if (be_verbose_global) - progress_indication ("]"); + debug_output ("[" + to_string (i), true); + s->output (midi_stream, i, ports_); + debug_output ("]", false); } } @@ -87,7 +85,6 @@ Performance::write_output (string out) const progress_indication ("\n"); } - void Performance::process () { @@ -96,5 +93,5 @@ Performance::process () Performance * unsmob_performance (SCM x) { - return dynamic_cast (unsmob_music_output (x)); + return dynamic_cast (unsmob_music_output (x)); }