X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fperformance.cc;h=35d47e2ebc4869a3839771d15905e36430de77ab;hb=b053638dac19bed7f8d2f8b8b0231b3611c17fde;hp=f25b63eea11c5d25175cb7bb27007667938f3202;hpb=f1baf9749eb3315b6f58622e084fc34295bccea7;p=lilypond.git diff --git a/lily/performance.cc b/lily/performance.cc index f25b63eea1..35d47e2ebc 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,159 +3,159 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 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 "lily-version.hh" - -#include "killing-cons.tcc" +#include "string-convert.hh" +#include "warn.hh" Performance::Performance () { - midi_l_ =0; - audio_elem_p_list_ = 0; + midi_ = 0; } - -Performance::~Performance() +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_staff_l_arr_.size() + 1; + int tracks_i = audio_staffs_.size () + 1; // ugh int clocks_per_4_i = 384; midi_stream << Midi_header (1, tracks_i, clocks_per_4_i); output_header_track (midi_stream); - int channel = 1; - for (int i =0; i < audio_staff_l_arr_.size (); i++) + message (_ ("Track...") + " "); + int channel = 0; + for (vsize i = 0; i < audio_staffs_.size (); i++) { - Audio_staff *s = audio_staff_l_arr_[i]; + Audio_staff *s = audio_staffs_[i]; + if (be_verbose_global) + progress_indication ("[" + to_string (i)); /* - Aargh, let's hear it for the MIDI standard. MIDI players tend to ignore instrument settings on channel 10, the percussion channel by default. - */ - if (channel == 9) + */ + 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) +Performance::output_header_track (Midi_stream &midi_stream) { Midi_track midi_track; + midi_track.channel_ = 9; + // perhaps multiple text events? - String str = String (_("Creator: ")); - if (no_timestamps_global_b) - str += gnu_lilypond_str (); - else - str += gnu_lilypond_version_str(); - str += "\n"; - - Midi_text creator (Midi_text::TEXT, str); + 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 = _f ("from musical definition: %s", origin_str_); + str = _ ("at "); + time_t t (time (0)); + str += ctime (&t); + str = str.substr (0, str.length () - 1); + str = String_convert::pad_to (str, 60); - Midi_text from (Midi_text::TEXT, str); - midi_track.add (Moment (0), &from); + Audio_text at_a (Audio_text::TEXT, str); + Midi_text at (&at_a); + midi_track.add (Moment (0), &at); - Midi_text track_name (Midi_text::TRACK_NAME, "Track " - + String_convert::i2dec_str (0, 0, '0')); - midi_track.add (Moment (0), &track_name); + // TODO: + // str = _f ("from musical definition: %s", origin_string_); - Midi_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4))); - midi_track.add (Moment (0), &tempo); + Audio_text from_a (Audio_text::TEXT, str); + Midi_text from (&from_a); + midi_track.add (Moment (0), &from); + + 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_stream << midi_track; } void Performance::add_element (Audio_element *p) { - if (Audio_staff*s=dynamic_cast (p)) - { - audio_staff_l_arr_.push (s); - } - else if (Audio_column *c = dynamic_cast(p)) - { - c->performance_l_ = 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); -void -Performance::print() const -{ -#ifndef NPRINT - DOUT << "Performance { "; - DOUT << "Items: "; - for (Cons* i =audio_elem_p_list_; i; i = i->next_) - i->car_->print (); - DOUT << "}"; -#endif + audio_elements_.push_back (p); } void -Performance::process() +Performance::write_output (string out) { - print (); + if (out == "-") + out = "lelie.midi"; - String out = midi_l_->get_default_output (); - if (out.empty_b ()) - { - - out = default_outname_base_global; - if (out == "-") - out = "lelie"; - int def = midi_l_->get_next_default_count (); - if (def) - { - out += "-" + to_str (def); - } + /* Maybe a bit crude, but we had this before */ + File_name file_name (out); + file_name.ext_ = "midi"; + out = file_name.to_string (); - out += ".midi"; - } - Midi_stream midi_stream (out); - *mlog << _f ("MIDI output to %s...", out) << endl; - target_str_global_array.push (out); + message (_f ("MIDI output to `%s'...", out)); output (midi_stream); - *mlog << endl; + progress_indication ("\n"); } +