X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=ec4de3e9f8cabb2c66ac436e09ae22afddc168c0;hb=e7e1ce259bcd834a233bc5a54e39109301a821bf;hp=6d0595f54b43f959caa1b90688aaf2df8293a90b;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 6d0595f54b..ec4de3e9f8 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--2015 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 @@ -18,6 +18,7 @@ */ #include +#include #include "audio-column.hh" #include "audio-item.hh" @@ -26,6 +27,13 @@ #include "international.hh" #include "performer-group.hh" #include "warn.hh" +#include "lily-imports.hh" + +#include "translator.icc" + +using std::deque; +using std::map; +using std::string; /* Perform a staff. Individual notes should have their instrument (staff-wide) set, so we override play_element () @@ -45,12 +53,12 @@ protected: private: string new_instrument_string (); - 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); - Audio_dynamic *get_dynamic (string voice); + void set_instrument_name (const string &voice); + void set_instrument (int channel, const string &voice); + int get_channel (const string &instrument); + Audio_staff *get_audio_staff (const string &voice); + Audio_staff *new_audio_staff (const string &voice); + Audio_dynamic *get_dynamic (const string &voice); string instrument_string_; int channel_; @@ -58,6 +66,7 @@ private: Audio_text *instrument_name_; Audio_text *name_; Audio_tempo *tempo_; + map > note_map_; map staff_map_; map channel_map_; map dynamic_map_; @@ -74,8 +83,6 @@ 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 */ "", @@ -109,7 +116,7 @@ Staff_performer::initialize () } Audio_staff * -Staff_performer::new_audio_staff (string voice) +Staff_performer::new_audio_staff (const string &voice) { Audio_staff *audio_staff = new Audio_staff; audio_staff->merge_unisons_ @@ -126,14 +133,40 @@ Staff_performer::new_audio_staff (string voice) staff_map_[voice] = audio_staff; if (!instrument_string_.empty ()) set_instrument (channel_, voice); + // Set initial values (if any) for control functions. + for (const Audio_control_function_value_change::Context_property *p + = Audio_control_function_value_change::context_properties_; + p->name_; ++p) + { + SCM value = get_property (p->name_); + if (scm_is_number (value)) + { + Real val = scm_to_double (value); + if (val >= p->range_min_ && val <= p->range_max_) + { + // Normalize the value to the 0.0 to 1.0 range. + val = ((val - p->range_min_) + / (p->range_max_ - p->range_min_)); + Audio_control_function_value_change *item + = new Audio_control_function_value_change (p->control_, val); + item->channel_ = channel_; + audio_staff->add_audio_item (item); + announce_element (Audio_element_info (item, 0)); + } + else + warning (_f ("ignoring out-of-range value change for MIDI " + "property `%s'", + p->name_)); + } + } return audio_staff; } Audio_staff * -Staff_performer::get_audio_staff (string voice) +Staff_performer::get_audio_staff (const string &voice) { SCM channel_mapping = get_property ("midiChannelMapping"); - if (channel_mapping != ly_symbol2scm ("instrument") + if (!scm_is_eq (channel_mapping, ly_symbol2scm ("instrument")) && staff_map_.size ()) return staff_map_.begin ()->second; @@ -150,7 +183,7 @@ Staff_performer::get_audio_staff (string voice) } Audio_dynamic * -Staff_performer::get_dynamic (string voice) +Staff_performer::get_dynamic (const string &voice) { map::const_iterator i = dynamic_map_.find (voice); if (i != dynamic_map_.end ()) @@ -164,20 +197,19 @@ Staff_performer::process_music () } void -Staff_performer::set_instrument (int channel, string voice) +Staff_performer::set_instrument (int channel, const 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->add_audio_item (instrument_); - SCM proc = ly_lily_module_constant ("percussion?"); - SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ())); - audio_staff->percussion_ = (drums == SCM_BOOL_T); + SCM drums = Lily::percussion_p (ly_symbol2scm (instrument_string_.c_str ())); + audio_staff->percussion_ = to_boolean (drums); } void -Staff_performer::set_instrument_name (string voice) +Staff_performer::set_instrument_name (const string &voice) { instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, instrument_string_); @@ -192,6 +224,22 @@ Staff_performer::stop_translation_timestep () tempo_ = 0; instrument_name_ = 0; instrument_ = 0; + // For each voice with a note played in the current translation time step, + // check if the voice has an Audio_dynamic registered: if yes, apply this + // dynamic to every note played in the voice in the current translation time + // step. + for (map >::iterator vi = note_map_.begin (); + vi != note_map_.end (); ++vi) + { + Audio_dynamic *d = get_dynamic (vi->first); + if (d) + { + for (deque::iterator ni = vi->second.begin (); + ni != vi->second.end (); ++ni) + (*ni)->dynamic_ = d; + } + } + note_map_.clear (); } void @@ -224,15 +272,15 @@ Staff_performer::new_instrument_string () } int -Staff_performer::get_channel (string instrument) +Staff_performer::get_channel (const string &instrument) { SCM channel_mapping = get_property ("midiChannelMapping"); - map& channel_map - = (channel_mapping != ly_symbol2scm ("instrument")) + map &channel_map + = (!scm_is_eq (channel_mapping, ly_symbol2scm ("instrument"))) ? channel_map_ : static_channel_map_; - if (channel_mapping == ly_symbol2scm ("staff") + if (scm_is_eq (channel_mapping, ly_symbol2scm ("staff")) && channel_ >= 0) return channel_; @@ -240,7 +288,7 @@ Staff_performer::get_channel (string instrument) if (i != channel_map.end ()) return i->second; - int channel = (channel_mapping == ly_symbol2scm ("staff")) + int channel = (scm_is_eq (channel_mapping, ly_symbol2scm ("staff"))) ? channel_count_++ : channel_map.size (); @@ -275,13 +323,13 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf) voice = c->id_string (); SCM channel_mapping = get_property ("midiChannelMapping"); string str = new_instrument_string (); - if (channel_mapping != ly_symbol2scm ("instrument")) + if (!scm_is_eq (channel_mapping, ly_symbol2scm ("instrument"))) channel_ = get_channel (voice); else if (channel_ < 0 && str.empty ()) channel_ = get_channel (str); if (str.length ()) { - if (channel_mapping != ly_symbol2scm ("voice")) + if (!scm_is_eq (channel_mapping, ly_symbol2scm ("voice"))) channel_ = get_channel (str); set_instrument (channel_, voice); set_instrument_name (voice); @@ -290,15 +338,19 @@ Staff_performer::acknowledge_audio_element (Audio_element_info inf) bool encode_dynamics_as_velocity_ = true; if (encode_dynamics_as_velocity_) { - if (Audio_dynamic *d = dynamic_cast (inf.elem_)) + if (Audio_note *n = dynamic_cast (inf.elem_)) + { + // Keep track of the notes played in the current voice in this + // translation time step (for adjusting their dynamics later in + // stop_translation_timestep). + note_map_[voice].push_back (n); + } + else 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);