X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=1af71efd86db801f06c6b6222e8e7d73e8eae730;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=2fd85fe48286920492a440b77fc1e7b4cccf357e;hpb=ee44e5855df96a91937bdf36e7268bb9feb0f77b;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 2fd85fe482..1af71efd86 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,14 +18,19 @@ */ #include +#include #include "audio-column.hh" #include "audio-item.hh" #include "audio-staff.hh" #include "context.hh" #include "international.hh" +#include "midi-cc-announcer.hh" #include "performer-group.hh" #include "warn.hh" +#include "lily-imports.hh" + +#include "translator.icc" /* Perform a staff. Individual notes should have their instrument (staff-wide) set, so we override play_element () @@ -45,12 +50,27 @@ 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); + + class Midi_control_initializer : public Midi_control_change_announcer + { + public: + Midi_control_initializer (Staff_performer *performer, + Audio_staff *audio_staff, + int channel); + + SCM get_property_value (const char *property_name); + void do_announce (Audio_control_change *item); + + private: + Staff_performer *performer_; + Audio_staff *audio_staff_; + int channel_; + }; string instrument_string_; int channel_; @@ -58,37 +78,47 @@ private: Audio_text *instrument_name_; Audio_text *name_; Audio_tempo *tempo_; - map staff_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" +void +Staff_performer::boot () +{ + +} ADD_TRANSLATOR (Staff_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "", + /* read */ + "", - /* write */ - ""); + /* write */ + ""); -Staff_performer::Staff_performer () - : channel_ (-1) - , instrument_ (0) - , instrument_name_ (0) - , name_ (0) - , tempo_ (0) +Staff_performer::Staff_performer (Context *c) + : Performer (c), + channel_ (-1), + instrument_ (0), + instrument_name_ (0), + name_ (0), + tempo_ (0) { } @@ -99,17 +129,20 @@ Staff_performer::~Staff_performer () void Staff_performer::initialize () { + ++staff_performer_count_; } -Audio_staff* -Staff_performer::new_audio_staff (string voice) +Audio_staff * +Staff_performer::new_audio_staff (const string &voice) { - Audio_staff* audio_staff = new Audio_staff; + 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); + + ":" + voice); audio_staff->add_audio_item (name_); announce_element (Audio_element_info (name_, 0)); } @@ -117,21 +150,24 @@ 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 MIDI controls. + Midi_control_initializer i (this, audio_staff, channel_); + i.announce_control_changes (); return audio_staff; } -Audio_staff* -Staff_performer::get_audio_staff (string voice) +Audio_staff * +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; - map::const_iterator i = staff_map_.find (voice); + 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; @@ -140,38 +176,28 @@ Staff_performer::get_audio_staff (string voice) return new_audio_staff (voice); } -Audio_dynamic* -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::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 *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_); + instrument_string_); announce_element (Audio_element_info (instrument_name_, 0)); get_audio_staff (voice)->add_audio_item (instrument_name_); } @@ -190,6 +216,13 @@ Staff_performer::finalize () { 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 @@ -208,25 +241,25 @@ 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")) - ? channel_map_ - : static_channel_map_; + 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_; 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 (); + + int channel = (scm_is_eq (channel_mapping, ly_symbol2scm ("staff"))) + ? channel_count_++ + : channel_map.size (); /* MIDI players tend to ignore instrument settings on channel 10, the percussion channel. */ @@ -240,7 +273,7 @@ Staff_performer::get_channel (string instrument) { warning (_ ("MIDI channel wrapped around")); warning (_ ("remapping modulo 16")); - channel = channel % 16; + channel = channel % 16; } channel_map[instrument] = channel; @@ -250,42 +283,50 @@ Staff_performer::get_channel (string instrument) void Staff_performer::acknowledge_audio_element (Audio_element_info inf) { + /* 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 (!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 (!scm_is_eq (channel_mapping, ly_symbol2scm ("voice"))) + channel_ = get_channel (str); + set_instrument (channel_, voice); + set_instrument_name (voice); + } + Audio_staff *audio_staff = get_audio_staff (voice); if (Audio_item *ai = dynamic_cast (inf.elem_)) { - /* 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 (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_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); } } +Staff_performer::Midi_control_initializer::Midi_control_initializer +(Staff_performer *performer, Audio_staff *audio_staff, int channel) + : performer_ (performer), + audio_staff_ (audio_staff), + channel_ (channel) +{ +} + +SCM Staff_performer::Midi_control_initializer::get_property_value +(const char *property_name) +{ + return performer_->get_property (property_name); +} + +void Staff_performer::Midi_control_initializer::do_announce +(Audio_control_change *item) +{ + item->channel_ = channel_; + audio_staff_->add_audio_item (item); + performer_->announce_element (Audio_element_info (item, 0)); +}