X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=90d43f6b141afac6d772f6f64fd7ea735304494a;hb=6d84a36fd1dde3fe2035ff17a78672c72f3ab0fc;hp=5e124c8bafb0451680254acc43b745b6c72b0c68;hpb=bea1783a6b70e41c45f85136146cdd7fa773fb8e;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 5e124c8baf..90d43f6b14 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2012 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -48,9 +48,9 @@ private: void set_instrument_name (string voice); void set_instrument (int channel, string voice); int get_channel (string instrument); - Audio_staff* get_audio_staff (string voice); - Audio_staff* new_audio_staff (string voice); - Real get_dynamic (string voice); + Audio_staff *get_audio_staff (string voice); + Audio_staff *new_audio_staff (string voice); + Audio_dynamic *get_dynamic (string voice); string instrument_string_; int channel_; @@ -58,37 +58,43 @@ private: Audio_text *instrument_name_; Audio_text *name_; Audio_tempo *tempo_; - map staff_map_; + map staff_map_; map channel_map_; - map dynamic_map_; + map dynamic_map_; + // Would prefer to have the following two items be + // members of the containing class Performance, + // so they can be reset for each new midi file output. static map static_channel_map_; static int channel_count_; + // For now, ask the last Staff_performer clean up during its finalize method + static int staff_performer_count_; }; map Staff_performer::static_channel_map_; int Staff_performer::channel_count_ = 0; +int Staff_performer::staff_performer_count_ = 0; #include "translator.icc" ADD_TRANSLATOR (Staff_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "", + /* read */ + "", - /* write */ - ""); + /* write */ + ""); Staff_performer::Staff_performer () - : channel_ (0) - , instrument_ (0) - , instrument_name_ (0) - , name_ (0) - , tempo_ (0) + : channel_ (-1), + instrument_ (0), + instrument_name_ (0), + name_ (0), + tempo_ (0) { } @@ -99,28 +105,42 @@ Staff_performer::~Staff_performer () void Staff_performer::initialize () { + ++staff_performer_count_; } -Audio_staff* +Audio_staff * Staff_performer::new_audio_staff (string voice) { - Audio_staff* audio_staff = new Audio_staff; - name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string () - + ":" + voice); - audio_staff->add_audio_item (name_); + Audio_staff *audio_staff = new Audio_staff; + audio_staff->merge_unisons_ + = to_boolean (get_property ("midiMergeUnisons")); + string track_name = context ()->id_string () + ":" + voice; + if (track_name != ":") + { + name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string () + + ":" + voice); + audio_staff->add_audio_item (name_); + announce_element (Audio_element_info (name_, 0)); + } announce_element (Audio_element_info (audio_staff, 0)); - announce_element (Audio_element_info (name_, 0)); staff_map_[voice] = audio_staff; + if (!instrument_string_.empty ()) + set_instrument (channel_, voice); return audio_staff; } -Audio_staff* +Audio_staff * Staff_performer::get_audio_staff (string voice) { - map::const_iterator i = staff_map_.find (voice); + SCM channel_mapping = get_property ("midiChannelMapping"); + if (channel_mapping != ly_symbol2scm ("instrument") + && staff_map_.size ()) + return staff_map_.begin ()->second; + + map::const_iterator i = staff_map_.find (voice); if (i != staff_map_.end ()) return i->second; - map::const_iterator e = staff_map_.find (""); + map::const_iterator e = staff_map_.find (""); if (staff_map_.size () == 1 && e != staff_map_.end ()) { staff_map_[voice] = e->second; @@ -129,10 +149,10 @@ Staff_performer::get_audio_staff (string voice) return new_audio_staff (voice); } -Real +Audio_dynamic * Staff_performer::get_dynamic (string voice) { - map::const_iterator i = dynamic_map_.find (voice); + map::const_iterator i = dynamic_map_.find (voice); if (i != dynamic_map_.end ()) return i->second; return 0; @@ -149,7 +169,7 @@ Staff_performer::set_instrument (int channel, string voice) instrument_ = new Audio_instrument (instrument_string_); instrument_->channel_ = channel; announce_element (Audio_element_info (instrument_, 0)); - Audio_staff* audio_staff = get_audio_staff (voice); + Audio_staff *audio_staff = get_audio_staff (voice); audio_staff->add_audio_item (instrument_); SCM proc = ly_lily_module_constant ("percussion?"); SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ())); @@ -160,7 +180,7 @@ void Staff_performer::set_instrument_name (string voice) { instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, - instrument_string_); + instrument_string_); announce_element (Audio_element_info (instrument_name_, 0)); get_audio_staff (voice)->add_audio_item (instrument_name_); } @@ -179,8 +199,13 @@ Staff_performer::finalize () { staff_map_.clear (); channel_map_.clear (); - channel_count_ = 0; - static_channel_map_.clear (); + if (staff_performer_count_) + --staff_performer_count_; + if (0 == staff_performer_count_) + { + static_channel_map_.clear (); + channel_count_ = 0; + } } string @@ -201,29 +226,37 @@ Staff_performer::new_instrument_string () int Staff_performer::get_channel (string instrument) { - SCM channel_per_staff = get_property ("midiChannelPerStaff"); - map& channel_map = (channel_per_staff == SCM_BOOL_T) - ? channel_map_ - : static_channel_map_; + SCM channel_mapping = get_property ("midiChannelMapping"); + map& channel_map + = (channel_mapping != ly_symbol2scm ("instrument")) + ? channel_map_ + : static_channel_map_; + + if (channel_mapping == ly_symbol2scm ("staff") + && channel_ >= 0) + return channel_; map::const_iterator i = channel_map.find (instrument); if (i != channel_map.end ()) return i->second; - - int channel = (channel_per_staff == SCM_BOOL_T) - ? channel_count_++ - :channel_map.size (); + + int channel = (channel_mapping == ly_symbol2scm ("staff")) + ? channel_count_++ + : channel_map.size (); /* MIDI players tend to ignore instrument settings on channel 10, the percussion channel. */ if (channel % 16 == 9) - channel_map["percussion"] = channel++; + { + channel_map["percussion"] = channel++; + channel_count_++; + } if (channel > 15) { warning (_ ("MIDI channel wrapped around")); warning (_ ("remapping modulo 16")); - channel = channel % 16; + channel = channel % 16; } channel_map[instrument] = channel; @@ -236,24 +269,38 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf) if (Audio_item *ai = dynamic_cast (inf.elem_)) { /* map each context (voice) to its own track */ - Context* c = inf.origin_contexts (this)[0]; + Context *c = inf.origin_contexts (this)[0]; string voice; if (c->is_alias (ly_symbol2scm ("Voice"))) - voice = c->id_string (); + voice = c->id_string (); + SCM channel_mapping = get_property ("midiChannelMapping"); string str = new_instrument_string (); + if (channel_mapping != ly_symbol2scm ("instrument")) + channel_ = get_channel (voice); + else if (channel_ < 0 && str.empty ()) + channel_ = get_channel (str); if (str.length ()) - { - channel_ = get_channel (str); - set_instrument (channel_, voice); - set_instrument_name (voice); - } - Audio_staff* audio_staff = get_audio_staff (voice); + { + if (channel_mapping != ly_symbol2scm ("voice")) + channel_ = get_channel (str); + set_instrument (channel_, voice); + set_instrument_name (voice); + } ai->channel_ = channel_; - if (Audio_dynamic *d = dynamic_cast (inf.elem_)) - dynamic_map_[voice] = d->volume_; - if (Real d = get_dynamic (voice)) - if (Audio_note *n = dynamic_cast (inf.elem_)) - n->volume_ = d; + bool encode_dynamics_as_velocity_ = true; + if (encode_dynamics_as_velocity_) + { + if (Audio_dynamic *d = dynamic_cast (inf.elem_)) + { + dynamic_map_[voice] = d; + // Output volume as velocity: must disable Midi_dynamic output + d->silent_ = true; + } + if (Audio_dynamic *d = get_dynamic (voice)) + if (Audio_note *n = dynamic_cast (inf.elem_)) + n->dynamic_ = d; + } + Audio_staff *audio_staff = get_audio_staff (voice); audio_staff->add_audio_item (ai); } }