X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=23be820ad001b5ee3d5a5726894d552619bfde70;hb=8d0267eb80a7cb026751db0a9eabeb61d958776e;hp=e10a51c229e258d3595f534ce9518b0cee214463;hpb=73be5f6fe264e90a56e45f2d70129b133731188b;p=lilypond.git diff --git a/lily/performance.cc b/lily/performance.cc index e10a51c229..23be820ad0 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,11 +3,11 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Jan Nieuwenhuizen + (c) 1997--2003 Jan Nieuwenhuizen */ #include -#include "debug.hh" +#include "warn.hh" #include "string.hh" #include "string-convert.hh" #include "main.hh" @@ -15,28 +15,24 @@ #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 "file-results.hh" +#include "input-file-results.hh" +#include "file-path.hh" #include "lily-version.hh" #include "killing-cons.tcc" Performance::Performance () { - midi_l_ =0; + midi_ =0; audio_elem_p_list_ = 0; } -void -Performance::add_column (Audio_column* p) -{ - p->performance_l_ = this; - add_element (p); -} -Performance::~Performance() +Performance::~Performance () { delete audio_elem_p_list_; } @@ -44,121 +40,136 @@ Performance::~Performance() void 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 n = 1; - for (int i =0; i < audio_staff_l_arr_.size (); i++) + progress_indication ("\n"); + progress_indication (_ ("Track ... ")); + int channel = 0; + for (int i =0; i < audio_staffs_.size (); i++) { - Audio_staff *s = audio_staff_l_arr_[i]; + Audio_staff *s = audio_staffs_[i]; + if (verbose_global_b) + 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 (n == 10) - n++; - s->output (midi_stream, n++); + if (channel == 9) + channel++; + if (s->channel_ < 0) + s->channel_ = channel; + s->output (midi_stream, channel++); + if (verbose_global_b) + progress_indication ("]"); } } + void 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 = _ ("at "); + time_t t (time (0)); + str += ctime (&t); + str = str.left_string (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 = _f ("from musical definition: %s", origin_str_); + + str = _f ("from musical definition: %s", origin_string_); - Midi_text from (Midi_text::TEXT, str); + 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 << midi_track; } -void -Performance::add_staff (Audio_staff* l) -{ - audio_staff_l_arr_.push (l); -} - 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_); } -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 -} void -Performance::process() +Performance::process () { - print (); - - String out = midi_l_->get_default_output (); - if (out.empty_b ()) + String out = output_name_global; + if (out == "-") + out = "lelie.midi"; + int def = midi_->get_next_score_count (); + if (def) { - - out = default_outname_base_global; - if (out == "-") - out = "lelie"; - int def = midi_l_->get_next_default_count (); - if (def) - { - out += "-" + to_str (def); - } - - out += ".midi"; + Path p = split_path (out); + p.base += "-" + to_string (def); + out = p.to_string (); } + + /* 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); - *mlog << _f ("MIDI output to %s...", out) << endl; - target_str_global_array.push (out); + progress_indication (_f ("MIDI output to `%s'...", out)); + + global_input_file->target_strings_.push (out); output (midi_stream); - *mlog << endl; + progress_indication ("\n"); }