X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=5e124c8bafb0451680254acc43b745b6c72b0c68;hb=bea1783a6b70e41c45f85136146cdd7fa773fb8e;hp=756b5e3a8114a5fca147be2f6c6698ed2f76c07a;hpb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 756b5e3a81..5e124c8baf 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -1,17 +1,31 @@ /* - 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--2011 Jan Nieuwenhuizen - (c) 1997--2009 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 "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 +36,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,13 +44,30 @@ protected: void stop_translation_timestep (); private: - Audio_staff *audio_staff_; + 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); + Real get_dynamic (string voice); + + string instrument_string_; + int channel_; Audio_instrument *instrument_; Audio_text *instrument_name_; Audio_text *name_; Audio_tempo *tempo_; + map staff_map_; + map channel_map_; + map dynamic_map_; + static map static_channel_map_; + static int channel_count_; }; +map Staff_performer::static_channel_map_; +int Staff_performer::channel_count_ = 0; + #include "translator.icc" ADD_TRANSLATOR (Staff_performer, @@ -56,12 +84,12 @@ ADD_TRANSLATOR (Staff_performer, ""); Staff_performer::Staff_performer () + : channel_ (0) + , 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 () @@ -71,50 +99,77 @@ Staff_performer::~Staff_performer () void Staff_performer::initialize () { - audio_staff_ = new Audio_staff; - name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ()); +} - audio_staff_->add_audio_item (name_); - - announce_element (Audio_element_info (audio_staff_, 0)); +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_); + announce_element (Audio_element_info (audio_staff, 0)); announce_element (Audio_element_info (name_, 0)); + staff_map_[voice] = audio_staff; + return audio_staff; } -void -Staff_performer::process_music () +Audio_staff* +Staff_performer::get_audio_staff (string voice) { - string str = new_instrument_string (); - if (str.length ()) + 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); +} + +Real +Staff_performer::get_dynamic (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, 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 (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; } @@ -122,7 +177,10 @@ Staff_performer::stop_translation_timestep () void Staff_performer::finalize () { - audio_staff_ = 0; + staff_map_.clear (); + channel_map_.clear (); + channel_count_ = 0; + static_channel_map_.clear (); } string @@ -140,10 +198,63 @@ Staff_performer::new_instrument_string () return 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_; + + 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 (); + + /* MIDI players tend to ignore instrument settings on channel + 10, the percussion channel. */ + if (channel % 16 == 9) + channel_map["percussion"] = channel++; + + 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 (); + string str = new_instrument_string (); + if (str.length ()) + { + channel_ = get_channel (str); + set_instrument (channel_, voice); + set_instrument_name (voice); + } + Audio_staff* audio_staff = get_audio_staff (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; + audio_staff->add_audio_item (ai); + } }