X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=8d565418946bd49037dc7b178382811a28193efc;hb=e5380f29f23e204a603f8398368d2a7dc0260aa0;hp=41e7d1cf9252c8bc9b63741cf40b48a7afffc45f;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 41e7d1cf92..8d56541894 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -1,58 +1,81 @@ /* - 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--2001 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. -#include "translator-group.hh" -#include "debug.hh" + 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 + +#include "warn.hh" #include "audio-column.hh" #include "audio-item.hh" #include "audio-staff.hh" -#include "performer-group-performer.hh" +#include "performer-group.hh" +#include "context.hh" -/** Perform a staff. Individual notes should have their instrument - (staff-wide) set, so we override play_element () - - */ -class Staff_performer : public Performer_group_performer +/* Perform a staff. Individual notes should have their instrument + (staff-wide) set, so we override play_element () +*/ +class Staff_performer : public Performer { public: - VIRTUAL_COPY_CONS (Translator); - - - Staff_performer (); + TRANSLATOR_DECLARATIONS (Staff_performer); ~Staff_performer (); - String new_instrument_str (); - String instrument_str_; + string new_instrument_string (); + string instrument_string_; protected: - virtual void play_element (Audio_element* p); + virtual void acknowledge_audio_element (Audio_element_info info); virtual void finalize (); virtual void initialize (); - virtual void create_audio_elements (); - virtual void stop_translation_timestep (); + void process_music (); + void stop_translation_timestep (); private: - Audio_staff* audio_staff_p_; - Audio_instrument* instrument_p_; - Audio_text* instrument_name_p_; - Audio_text* name_p_; - Audio_tempo* tempo_p_; + Audio_staff *audio_staff_; + Audio_instrument *instrument_; + Audio_text *instrument_name_; + Audio_text *name_; + Audio_tempo *tempo_; + map channel_map_; }; -ADD_THIS_TRANSLATOR (Staff_performer); +#include "translator.icc" + +ADD_TRANSLATOR (Staff_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + ""); Staff_performer::Staff_performer () { - audio_staff_p_ = 0; - instrument_p_ = 0; - instrument_name_p_ = 0; - name_p_ = 0; - tempo_p_ = 0; + audio_staff_ = 0; + instrument_ = 0; + instrument_name_ = 0; + name_ = 0; + tempo_ = 0; } Staff_performer::~Staff_performer () @@ -62,91 +85,92 @@ Staff_performer::~Staff_performer () void Staff_performer::initialize () { - audio_staff_p_ = new Audio_staff; - announce_element (Audio_element_info (audio_staff_p_, 0)); - - name_p_ = new Audio_text (Audio_text::TRACK_NAME, id_str_); - announce_element (Audio_element_info (name_p_, 0)); - - tempo_p_ = new Audio_tempo (get_tempo_i ()); - announce_element (Audio_element_info (tempo_p_, 0)); + audio_staff_ = new Audio_staff; + name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ()); - Performer_group_performer::initialize (); + audio_staff_->add_audio_item (name_); + + announce_element (Audio_element_info (audio_staff_, 0)); + announce_element (Audio_element_info (name_, 0)); } void -Staff_performer::create_audio_elements () +Staff_performer::process_music () { - String str = new_instrument_str (); - if (str.length_i ()) + string str = new_instrument_string (); + if (str.length ()) { - instrument_name_p_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str); - announce_element (Audio_element_info (instrument_name_p_, 0)); - instrument_p_ = new Audio_instrument (str); - announce_element (Audio_element_info (instrument_p_, 0)); + 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. + */ } - Performer_group_performer::create_audio_elements (); } void Staff_performer::stop_translation_timestep () { - if (name_p_) - { - play_element (name_p_); - name_p_ = 0; - } - if (tempo_p_) - { - play_element (tempo_p_); - tempo_p_ = 0; - } - if (instrument_name_p_) - { - play_element (instrument_name_p_); - instrument_name_p_ = 0; - } - if (instrument_p_) - { - play_element (instrument_p_); - instrument_p_ = 0; - } - Performer_group_performer::stop_translation_timestep (); + 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); + + if (name_) + name_ = 0; + if (tempo_) + tempo_ = 0; + instrument_name_ = 0; + instrument_ = 0; } void Staff_performer::finalize () { - Performer_group_performer::finalize (); - Performer::play_element (audio_staff_p_); - audio_staff_p_ = 0; + audio_staff_ = 0; } -String -Staff_performer::new_instrument_str () -{ +string +Staff_performer::new_instrument_string () +{ // mustn't ask Score for instrument: it will return piano! - SCM minstr = get_property (ly_symbol2scm ("midiInstrument")); - - if (!gh_string_p (minstr)) - minstr = get_property (ly_symbol2scm ("instrument")); + SCM minstr = get_property ("midiInstrument"); - if (!gh_string_p (minstr) - || ly_scm2string (minstr) == instrument_str_) + if (!scm_is_string (minstr) + || ly_scm2string (minstr) == instrument_string_) return ""; - instrument_str_ = ly_scm2string (minstr); + instrument_string_ = ly_scm2string (minstr); - return instrument_str_; + return instrument_string_; } -void -Staff_performer::play_element (Audio_element* p) +void +Staff_performer::acknowledge_audio_element (Audio_element_info inf) { - if (Audio_item *ai = dynamic_cast (p)) + if (Audio_item *ai = dynamic_cast (inf.elem_)) { - audio_staff_p_->add_audio_item (ai); + /* map each context (voice) to its own channel */ + Context *c = inf.origin_contexts (this)[0]; + string id = c->id_string (); + int channel = channel_map_.size (); + /* MIDI players tend to ignore instrument settings on channel + 10, the percussion channel. */ + if (channel % 16 == 9) + channel_map_[""] = channel++; + + map::const_iterator i = channel_map_.find (id); + if (i != channel_map_.end ()) + channel = i->second; + else + channel_map_[id] = channel; + + audio_staff_->add_audio_item (ai); } - Performer::play_element (p); }