X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=35d47e2ebc4869a3839771d15905e36430de77ab;hb=8d796a54fbfc350c56f04088cb0c009ee0287256;hp=71a84ddb5a3bc3cd75161754a9a9a38aa3503a85;hpb=1b401824fa6fa77ba5ba52cc9b1735a9aa43eb20;p=lilypond.git diff --git a/lily/performance.cc b/lily/performance.cc index 71a84ddb5a..35d47e2ebc 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,42 +3,38 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Jan Nieuwenhuizen + (c) 1997--2006 Jan Nieuwenhuizen */ -#include -#include "warn.hh" -#include "string.hh" -#include "string-convert.hh" +#include "performance.hh" + +#include +using namespace std; + +#include "audio-column.hh" +#include "audio-staff.hh" +#include "file-name.hh" +#include "international.hh" +#include "lily-version.hh" #include "main.hh" -#include "midi-def.hh" #include "midi-item.hh" #include "midi-stream.hh" -#include "audio-column.hh" -#include "audio-item.hh" -#include "audio-staff.hh" -#include "performance.hh" #include "score.hh" -#include "input-file-results.hh" -#include "file-path.hh" -#include "lily-version.hh" - -#include "killing-cons.tcc" +#include "string-convert.hh" +#include "warn.hh" Performance::Performance () { - midi_ =0; - audio_elem_p_list_ = 0; + midi_ = 0; } - Performance::~Performance () { - delete audio_elem_p_list_; + junk_pointers (audio_elements_); } void -Performance::output (Midi_stream& midi_stream) +Performance::output (Midi_stream &midi_stream) { int tracks_i = audio_staffs_.size () + 1; @@ -47,47 +43,58 @@ Performance::output (Midi_stream& midi_stream) midi_stream << Midi_header (1, tracks_i, clocks_per_4_i); output_header_track (midi_stream); - progress_indication ("\n"); - progress_indication (_ ("Track ... ")); + message (_ ("Track...") + " "); int channel = 0; - for (int i =0; i < audio_staffs_.size (); i++) + for (vsize i = 0; i < audio_staffs_.size (); i++) { Audio_staff *s = audio_staffs_[i]; - if (verbose_global_b) - progress_indication ("[" + to_string (i)) ; + if (be_verbose_global) + progress_indication ("[" + to_string (i)); /* MIDI players tend to ignore instrument settings on channel 10, the percussion channel by default. - */ - if (channel == 9) - channel++; + */ + if (channel % 16 == 9) + channel++; + + /* + Huh? Why does each staff also have a separate channel? We + should map channels to voices, not staves. --hwn. + */ if (s->channel_ < 0) - s->channel_ = channel; + { + s->channel_ = channel % 16; + if (channel > 15) + { + warning (_ ("MIDI channel wrapped around")); + warning (_ ("remapping modulo 16")); + } + } + s->output (midi_stream, channel++); - if (verbose_global_b) + if (be_verbose_global) progress_indication ("]"); } } - void -Performance::output_header_track (Midi_stream& midi_stream) +Performance::output_header_track (Midi_stream &midi_stream) { Midi_track midi_track; midi_track.channel_ = 9; // perhaps multiple text events? - String id_string; - String str = String (_ ("Creator: ")); + string id_string; + string str = string (_ ("Creator: ")); id_string = String_convert::pad_to (gnu_lilypond_version_string (), 30); str += id_string; /* This seems silly, but in fact the audio elements should be generated elsewhere: not midi-specific. - */ + */ Audio_text creator_a (Audio_text::TEXT, str); Midi_text creator (&creator_a); midi_track.add (Moment (0), &creator); @@ -95,22 +102,21 @@ Performance::output_header_track (Midi_stream& midi_stream) /* Better not translate this */ str = "Generated automatically by: "; str += id_string; - + Audio_text generate_a (Audio_text::TEXT, str); Midi_text generate (&generate_a); midi_track.add (Moment (0), &generate); - + str = _ ("at "); time_t t (time (0)); str += ctime (&t); - str = str.left_string (str.length () - 1); + str = str.substr (0, str.length () - 1); str = String_convert::pad_to (str, 60); - + Audio_text at_a (Audio_text::TEXT, str); Midi_text at (&at_a); midi_track.add (Moment (0), &at); - // TODO: // str = _f ("from musical definition: %s", origin_string_); @@ -121,48 +127,35 @@ Performance::output_header_track (Midi_stream& midi_stream) Audio_text track_name_a (Audio_text::TRACK_NAME, "Track " + String_convert::int2dec (0, 0, '0')); Midi_text track_name (&track_name_a); - - midi_track.add (Moment (0), &track_name); - - // Some sequencers read track 0 last. - // Audio_tempo tempo_a (midi_->get_tempo (Moment (Rational (1, 4)))); - // Midi_tempo tempo (&tempo_a); - // midi_track.add (Moment (0), &tempo); + midi_track.add (Moment (0), &track_name); midi_stream << midi_track; } void Performance::add_element (Audio_element *p) { - if (Audio_staff*s=dynamic_cast (p)) - { - audio_staffs_.push (s); - } - else if (Audio_column *c = dynamic_cast (p)) - { - c->performance_ = this; - } - audio_elem_p_list_ = new Killing_cons (p, audio_elem_p_list_); + if (Audio_staff *s = dynamic_cast (p)) + audio_staffs_.push_back (s); + + audio_elements_.push_back (p); } -SCM -Performance::process (String out) +void +Performance::write_output (string out) { if (out == "-") out = "lelie.midi"; - + /* Maybe a bit crude, but we had this before */ - Path p = split_path (out); - p.ext = "midi"; - out = p.to_string (); - - Midi_stream midi_stream (out); - progress_indication (_f ("MIDI output to `%s'...", out)); + File_name file_name (out); + file_name.ext_ = "midi"; + out = file_name.to_string (); - global_input_file->target_strings_.push (out); + Midi_stream midi_stream (out); + message (_f ("MIDI output to `%s'...", out)); output (midi_stream); progress_indication ("\n"); - return SCM_UNDEFINED; } +