X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=9e33c880017c207c6a5a1e3a20fb5a419af3d4e4;hb=5b54b66d529f663196e755ff5bb9650752a04539;hp=0d94d87ae758b5247f2816e08ee5b2396ac9e287;hpb=50802c7203c8e4a3eea1d7bf23064d60cd0d3ec7;p=lilypond.git diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 0d94d87ae7..9e33c88001 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -1,96 +1,160 @@ /* - staff-performer.cc -- implement Staff_performer + This file is part of LilyPond, the GNU music typesetter. + + Copyright (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 "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 (); + +private: + Audio_staff *audio_staff_; + Audio_instrument *instrument_; + Audio_text *instrument_name_; + Audio_text *name_; + Audio_tempo *tempo_; +}; - (c) 1996, 1997 Jan Nieuwenhuizen - */ +#include "translator.icc" +ADD_TRANSLATOR (Staff_performer, + /* doc */ + "", -#include "staff-performer.hh" -#include "translator.hh" -#include "input-translator.hh" -#include "debug.hh" -#include "midi-def.hh" -#include "midi-item.hh" -#include "midi-stream.hh" -#include "string.hh" -#include "string-convert.hh" + /* create */ + "", + /* read */ + "", -IMPLEMENT_IS_TYPE_B1(Staff_performer,Performer_group_performer); -ADD_THIS_PERFORMER(Staff_performer); + /* write */ + ""); -Staff_performer::Staff_performer() +Staff_performer::Staff_performer () { - midi_mom_ = 0; - midi_track_p_ = new Midi_track; + audio_staff_ = 0; + instrument_ = 0; + instrument_name_ = 0; + name_ = 0; + tempo_ = 0; } -void -Staff_performer::do_creation_processing() + +Staff_performer::~Staff_performer () { - header(); } void -Staff_performer::do_removal_processing() +Staff_performer::initialize () { - Performer::play_event( midi_track_p_); + 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)); + announce_element (Audio_element_info (name_, 0)); } -Staff_performer::~Staff_performer() +void +Staff_performer::process_music () { - delete midi_track_p_; + string str = new_instrument_string (); + if (str.length ()) + { + 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. + */ + } } void -Staff_performer::header() +Staff_performer::stop_translation_timestep () { - // set track name - Midi_text track_name( Midi_text::TRACK_NAME, instrument_str()); - midi_track_p_->add( Moment( 0 ), &track_name ); - - // set instrument description - Midi_text instrument_name( Midi_text::INSTRUMENT_NAME, instrument_str() ); - midi_track_p_->add( Moment( 0 ), &instrument_name ); - - // set instrument :-) - // lieve wendy, nu heb je mijn track_i_ / get_staff_i weggehaald... - // zie ook note-performer: ugh - // ugh, need to know channel (===track===staff) too - int channel_i = track_i_; - Midi_instrument instrument( channel_i, instrument_str() ); - midi_track_p_->add( Moment( 0 ), &instrument ); - - Midi_tempo midi_tempo( get_tempo_i( ) ); - midi_track_p_->add( Moment( 0 ), &midi_tempo ); + 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; + } + instrument_name_ = 0; + instrument_ = 0; } -String -Staff_performer::instrument_str() -{ - return Translator::id_str_; +void +Staff_performer::finalize () +{ + audio_staff_ = 0; } -void -Staff_performer::play_event( Midi_item* l ) +string +Staff_performer::new_instrument_string () { - Moment mom = get_mom(); - Moment delta_t = mom - midi_mom_ ; - midi_mom_ += delta_t; - midi_track_p_->add( delta_t, l); -} + // mustn't ask Score for instrument: it will return piano! + SCM minstr = get_property ("midiInstrument"); + if (!scm_is_string (minstr) + || ly_scm2string (minstr) == instrument_string_) + return ""; -// -int -Staff_performer::get_track_i() const -{ - return track_i_; + instrument_string_ = ly_scm2string (minstr); + + return instrument_string_; } void -Staff_performer::set_track( int& track_i_r ) +Staff_performer::acknowledge_audio_element (Audio_element_info inf) { - track_i_ = track_i_r++; + if (Audio_item *ai = dynamic_cast (inf.elem_)) + audio_staff_->add_audio_item (ai); } -//