X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=f765a3193772b021c0bcda98209810b2f676753e;hb=b8c29e36576221d2530c4ed5fe3262dbe69bd486;hp=81e281d659fa588d809e08c5a65b8f88726ea6f6;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git diff --git a/lily/performance.cc b/lily/performance.cc index 81e281d659..f765a31937 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,143 +3,165 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Jan Nieuwenhuizen + (c) 1997--2006 Jan Nieuwenhuizen */ -#include -#include "debug.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-staff.hh" -#include "performance.hh" #include "score.hh" -#include "file-results.hh" +#include "string-convert.hh" +#include "warn.hh" Performance::Performance () { - midi_l_ =0; + midi_ = 0; } -void -Performance::add (Audio_column* p) +Performance::~Performance () { - p->performance_l_ = this; - audio_column_p_list_.bottom().add (p); + junk_pointers (audio_elements_); } void -Performance::output (Midi_stream& midi_stream_r) +Performance::output (Midi_stream &midi_stream) { - int tracks_i = audio_staff_l_list_.size() + 1; + int tracks_i = audio_staffs_.size () + 1; + // ugh int clocks_per_4_i = 384; - midi_stream_r << Midi_header (1, tracks_i, clocks_per_4_i); - output_header_track (midi_stream_r); - int n = 1; - for (PCursor i (audio_staff_l_list_); i.ok(); i++) - i->output (midi_stream_r, n++); + + midi_stream << Midi_header (1, tracks_i, clocks_per_4_i); + output_header_track (midi_stream); + message (_ ("Track...") + " "); + int channel = 0; + for (vsize i = 0; i < audio_staffs_.size (); i++) + { + Audio_staff *s = audio_staffs_[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 % 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 % 16; + if (channel > 15) + { + warning (_ ("MIDI channel wrapped around")); + warning (_ ("remapping modulo 16")); + } + } + + s->output (midi_stream, channel++); + if (be_verbose_global) + progress_indication ("]"); + } } void -Performance::output_header_track (Midi_stream& midi_stream_r) +Performance::output_header_track (Midi_stream &midi_stream) { Midi_track midi_track; - // perhaps multiple text events? - String str = String (_("Creator: ")); - if (no_timestamps_global_b) - str += "GNU LilyPond\n"; - else - str += get_version_str() + "\n"; + midi_track.channel_ = 9; - Midi_text creator (Midi_text::TEXT, str); + // perhaps multiple text events? + 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); - str = _("Automatically generated"); - if (no_timestamps_global_b) - str += ".\n"; - else - { - str += _(", at "); - time_t t (time (0)); - str += ctime (&t); - str = str.left_str (str.length_i() - 1); - } - Midi_text generate (Midi_text::TEXT, str); + /* 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 = _("from musical definition: "); + str = _ ("at "); + time_t t (time (0)); + str += ctime (&t); + 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); - str += origin_str_; - Midi_text from (Midi_text::TEXT, str); + // TODO: + // str = _f ("from musical definition: %s", origin_string_); + + Audio_text from_a (Audio_text::TEXT, str); + Midi_text from (&from_a); midi_track.add (Moment (0), &from); - Midi_text track_name (Midi_text::TRACK_NAME, "Track " - + String_convert::i2dec_str (0, 0, '0')); + 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); - Midi_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4))); - midi_track.add (Moment (0), &tempo); + // 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_stream_r << midi_track; + midi_stream << midi_track; } void -Performance::add_staff (Audio_staff* l) +Performance::add_element (Audio_element *p) { - audio_staff_l_list_.bottom().add (l); -} + if (Audio_staff *s = dynamic_cast (p)) + audio_staffs_.push_back (s); -void -Performance::add (Audio_element *p) -{ - audio_elem_p_list_.bottom().add (p); + audio_elements_.push_back (p); } void -Performance::print() const +Performance::write_output (string out) { -#ifndef NPRINT - DOUT << "Performance { "; - DOUT << "Items: "; - for (PCursor i (audio_elem_p_list_.top ()); i.ok (); i++) - i->print (); - - DOUT << "\ncolumns: "; - for (PCursor i (audio_column_p_list_); i.ok(); i++) - i->print(); - DOUT << "}\n"; -#endif -} + if (out == "-") + out = "lelie.midi"; -void -Performance::process() -{ - print (); + /* Maybe a bit crude, but we had this before */ + File_name file_name (out); + file_name.ext_ = "midi"; + out = file_name.to_string (); - String out=midi_l_->outfile_str_; - if (out.empty_b ()) - { - - out = default_outname_base_global; - int def = midi_l_->get_next_default_count (); - if (def) - { - out += "-" + String(def); - } - - out += ".midi"; - } - Midi_stream midi_stream (out); - *mlog << _("MIDI output to ") << out<< " ..." << endl; - target_str_global_array.push (out); + message (_f ("MIDI output to `%s'...", out)); output (midi_stream); - *mlog << endl; + progress_indication ("\n"); } +