X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=d3368ad683820c771dd6ce398d60ea606927bec3;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=d0ad8e1e05f1fca07b50ac20bf5f83da33d2f8ce;hpb=ff01087b1958f7a0ee81301fe8c431fa7e37f6a4;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index d0ad8e1e05..d3368ad683 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -1,17 +1,32 @@ /* - staff-performer.cc -- implement Staff_performer + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2014 Jan Nieuwenhuizen - (c) 1997--2007 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "warn.hh" +#include +#include + #include "audio-column.hh" #include "audio-item.hh" #include "audio-staff.hh" -#include "performer-group.hh" #include "context.hh" +#include "international.hh" +#include "performer-group.hh" +#include "warn.hh" /* Perform a staff. Individual notes should have their instrument (staff-wide) set, so we override play_element () @@ -22,9 +37,6 @@ public: TRANSLATOR_DECLARATIONS (Staff_performer); ~Staff_performer (); - string new_instrument_string (); - string instrument_string_; - protected: virtual void acknowledge_audio_element (Audio_element_info info); virtual void finalize (); @@ -33,25 +45,59 @@ protected: void stop_translation_timestep (); private: - Audio_staff *audio_staff_; + string new_instrument_string (); + 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_; Audio_instrument *instrument_; Audio_text *instrument_name_; Audio_text *name_; Audio_tempo *tempo_; + map > note_map_; + map staff_map_; + map channel_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, "", "", - "", ""); +ADD_TRANSLATOR (Staff_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + ""); Staff_performer::Staff_performer () + : channel_ (-1), + instrument_ (0), + instrument_name_ (0), + name_ (0), + tempo_ (0) { - audio_staff_ = 0; - instrument_ = 0; - instrument_name_ = 0; - name_ = 0; - tempo_ = 0; } Staff_performer::~Staff_performer () @@ -61,58 +107,149 @@ Staff_performer::~Staff_performer () void Staff_performer::initialize () { - audio_staff_ = new Audio_staff; - name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ()); + ++staff_performer_count_; +} - audio_staff_->add_audio_item (name_); - - announce_element (Audio_element_info (audio_staff_, 0)); - announce_element (Audio_element_info (name_, 0)); +Audio_staff * +Staff_performer::new_audio_staff (const string &voice) +{ + 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)); + 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; } -void -Staff_performer::process_music () +Audio_staff * +Staff_performer::get_audio_staff (const string &voice) { - string str = new_instrument_string (); - if (str.length ()) + 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 (""); + if (staff_map_.size () == 1 && e != staff_map_.end ()) { - instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str); - announce_element (Audio_element_info (instrument_name_, 0)); - instrument_ = new Audio_instrument (str); - announce_element (Audio_element_info (instrument_, 0)); - - audio_staff_->add_audio_item (instrument_); - audio_staff_->add_audio_item (instrument_name_); - - /* - Have to be here before notes arrive into the staff. - */ + staff_map_[voice] = e->second; + return e->second; } + return new_audio_staff (voice); +} + +Audio_dynamic * +Staff_performer::get_dynamic (const string &voice) +{ + map::const_iterator i = dynamic_map_.find (voice); + if (i != dynamic_map_.end ()) + return i->second; + return 0; } void -Staff_performer::stop_translation_timestep () +Staff_performer::process_music () { - SCM proc = ly_lily_module_constant ("percussion?"); +} +void +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_->channel_ = (drums == SCM_BOOL_T ? 9 : -1); - if (name_) - { - name_ = 0; - } - if (tempo_) - { - tempo_ = 0; - } + audio_staff->percussion_ = (drums == SCM_BOOL_T); +} + +void +Staff_performer::set_instrument_name (const string &voice) +{ + instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, + instrument_string_); + announce_element (Audio_element_info (instrument_name_, 0)); + get_audio_staff (voice)->add_audio_item (instrument_name_); +} + +void +Staff_performer::stop_translation_timestep () +{ + name_ = 0; + 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 Staff_performer::finalize () { - audio_staff_ = 0; + staff_map_.clear (); + channel_map_.clear (); + if (staff_performer_count_) + --staff_performer_count_; + if (0 == staff_performer_count_) + { + static_channel_map_.clear (); + channel_count_ = 0; + } } string @@ -130,10 +267,89 @@ Staff_performer::new_instrument_string () return instrument_string_; } +int +Staff_performer::get_channel (const string &instrument) +{ + 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_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_count_++; + } + + if (channel > 15) + { + warning (_ ("MIDI channel wrapped around")); + warning (_ ("remapping modulo 16")); + channel = channel % 16; + } + + channel_map[instrument] = channel; + return channel; +} + void Staff_performer::acknowledge_audio_element (Audio_element_info inf) { if (Audio_item *ai = dynamic_cast (inf.elem_)) - audio_staff_->add_audio_item (ai); + { + /* map each context (voice) to its own track */ + Context *c = inf.origin_contexts (this)[0]; + string voice; + if (c->is_alias (ly_symbol2scm ("Voice"))) + 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 ()) + { + if (channel_mapping != ly_symbol2scm ("voice")) + channel_ = get_channel (str); + set_instrument (channel_, voice); + set_instrument_name (voice); + } + ai->channel_ = channel_; + bool encode_dynamics_as_velocity_ = true; + if (encode_dynamics_as_velocity_) + { + 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; + } + } + Audio_staff *audio_staff = get_audio_staff (voice); + audio_staff->add_audio_item (ai); + } }