X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=067a48ca71e173790c9dc91d9f36d3036e244ced;hb=937229525549c0aedbc9e90e2466270a63c32e5e;hp=92b8c06e0c091fb9bf8d48c4ace0d0eca8d1caf7;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 92b8c06e0c..067a48ca71 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -1,27 +1,78 @@ /* - 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--2010 Jan Nieuwenhuizen - (c) 1997--1999 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 "staff-performer.hh" -#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 "warn.hh" #include "audio-column.hh" #include "audio-item.hh" #include "audio-staff.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 +{ +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 (); + virtual void initialize (); + void process_music (); + void stop_translation_timestep (); -ADD_THIS_TRANSLATOR (Staff_performer); +private: + Audio_staff *audio_staff_; + Audio_instrument *instrument_; + Audio_text *instrument_name_; + Audio_text *name_; + Audio_tempo *tempo_; +}; + +#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 () @@ -29,92 +80,81 @@ Staff_performer::~Staff_performer () } void -Staff_performer::do_creation_processing () +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)); + audio_staff_ = new Audio_staff; + name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ()); - tempo_p_ = new Audio_tempo (get_tempo_i ()); - announce_element (Audio_element_info (tempo_p_, 0)); - - Performer_group_performer::do_creation_processing (); + audio_staff_->add_audio_item (name_); + + announce_element (Audio_element_info (audio_staff_, 0)); + announce_element (Audio_element_info (name_, 0)); } void -Staff_performer::do_process_requests () +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::do_process_requests (); } void -Staff_performer::do_pre_move_processing () +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_) + 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_) { - play_element (instrument_name_p_); - instrument_name_p_ = 0; + name_ = 0; } - if (instrument_p_) + if (tempo_) { - play_element (instrument_p_); - instrument_p_ = 0; + tempo_ = 0; } - Performer_group_performer::do_pre_move_processing (); + instrument_name_ = 0; + instrument_ = 0; } void -Staff_performer::do_removal_processing () +Staff_performer::finalize () { - Performer_group_performer::do_removal_processing (); - 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"), 0); - - if (!gh_string_p(minstr)) - minstr = get_property (ly_symbol2scm ("instrument"), 0); + SCM minstr = get_property ("midiInstrument"); - if (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)) - { - audio_staff_p_->add_audio_item (ai); - } - Performer::play_element (p); + if (Audio_item *ai = dynamic_cast (inf.elem_)) + audio_staff_->add_audio_item (ai); }