X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformance.cc;h=4fa167d8261f93c14fed3f63ff14116ccad1a6df;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5bb074307f11865035660b997fc550ef857dccb4;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git diff --git a/lily/performance.cc b/lily/performance.cc index 5bb074307f..4fa167d826 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,171 +3,114 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Jan Nieuwenhuizen + (c) 1997--2008 Jan Nieuwenhuizen */ -#include +#include "performance.hh" + +#include +using namespace std; #include "audio-column.hh" -#include "audio-item.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-chunk.hh" #include "midi-stream.hh" -#include "performance.hh" #include "score.hh" #include "string-convert.hh" -#include "string.hh" #include "warn.hh" -#include "killing-cons.tcc" - 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) const { - int tracks_i = audio_staffs_.size () + 1; - - // ugh - int clocks_per_4_i = 384; + int tracks_ = audio_staffs_.size (); - midi_stream << Midi_header (1, tracks_i, clocks_per_4_i); - output_header_track (midi_stream); - progress_indication ("\n"); - progress_indication (_ ("Track ... ")); + midi_stream.write (Midi_header (1, tracks_, 384)); + if (be_verbose_global) + progress_indication (_ ("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 % 16 == 9) - channel++; + int midi_channel = s->channel_; + if (midi_channel < 0) + { + midi_channel = channel; + channel ++; + /* + MIDI players tend to ignore instrument settings on + channel 10, the percussion 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) + */ + if (midi_channel > 15) { - s->channel_ = channel % 16; - if (channel > 15) - warning ("MIDI channel wrapped around. Remapping modulo 16."); + warning (_ ("MIDI channel wrapped around")); + warning (_ ("remapping modulo 16")); + + midi_channel = midi_channel % 16; } - - s->output (midi_stream, channel++); - if (verbose_global_b) + + s->output (midi_stream, midi_channel); + if (be_verbose_global) progress_indication ("]"); } } - - -void -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: ")); - 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); - - /* 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); - - - // 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); - - 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_stream << midi_track; -} - void Performance::add_element (Audio_element *p) { - if (Audio_staff*s=dynamic_cast (p)) - { - audio_staffs_.push (s); - } - audio_elem_p_list_ = new Killing_cons (p, audio_elem_p_list_); + audio_elements_.push_back (p); } -SCM -Performance::process (String out) +void +Performance::write_output (string out) const { if (out == "-") out = "lelie.midi"; - + /* Maybe a bit crude, but we had this before */ File_name file_name (out); - file_name.ext_ = "midi"; out = file_name.to_string (); - + Midi_stream midi_stream (out); - progress_indication (_f ("MIDI output to `%s'...", out)); + message (_f ("MIDI output to `%s'...", out)); output (midi_stream); progress_indication ("\n"); - return SCM_UNDEFINED; +} + + +void +Performance::process () +{ +} + +Performance * +unsmob_performance (SCM x) +{ + return dynamic_cast (unsmob_music_output (x)); }