X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-performer.cc;h=2552e6a32f3039ebce57d82be1c6b646ed5868c2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=242a181fcd5a24b77978e8b25e3ad90d54b9d992;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 242a181fcd..2552e6a32f 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -3,11 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Jan Nieuwenhuizen + (c) 2000--2008 Jan Nieuwenhuizen */ #include "performer.hh" + #include "audio-item.hh" +#include "international.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" + +typedef enum Pedal_type {SOSTENUTO, SUSTAIN, UNA_CORDA, NUM_PEDAL_TYPES}; /** perform Piano pedals @@ -16,130 +24,151 @@ class Piano_pedal_performer : public Performer { struct Pedal_info { - char const *name_; - Music *start_req_; - Drul_array req_drul_; + Stream_event *start_event_; + Drul_array event_drul_; }; public: TRANSLATOR_DECLARATIONS (Piano_pedal_performer); - ~Piano_pedal_performer (); protected: virtual void initialize (); - virtual bool try_music (Music *); - virtual void create_audio_elements (); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - + static const char *pedal_type_str (int t); + void process_music (); + void stop_translation_timestep (); + void start_translation_timestep (); + DECLARE_TRANSLATOR_LISTENER (sustain); + DECLARE_TRANSLATOR_LISTENER (una_corda); + DECLARE_TRANSLATOR_LISTENER (sostenuto); private: - Link_array audios_; - Pedal_info *info_alist_; + vector audios_; + Pedal_info info_alist_[NUM_PEDAL_TYPES]; }; Piano_pedal_performer::Piano_pedal_performer () { - info_alist_ = 0; } -Piano_pedal_performer::~Piano_pedal_performer () +const char * +Piano_pedal_performer::pedal_type_str (int t) { - delete[] info_alist_; + switch (t) + { + case SOSTENUTO: + return "Sostenuto"; + case SUSTAIN: + return "Sustain"; + case UNA_CORDA: + return "UnaCorda"; + default: + programming_error ("Unknown pedal type"); + return 0; + } } void Piano_pedal_performer::initialize () { - info_alist_ = new Pedal_info[4]; Pedal_info *p = info_alist_; - char *names [] = { "Sostenuto", "Sustain", "UnaCorda", 0 }; - char **np = names; - do + for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++) { - p->name_ = *np; - p->req_drul_[START] = 0; - p->req_drul_[STOP] = 0; - p->start_req_ = 0; - - p++; + p->event_drul_[START] = 0; + p->event_drul_[STOP] = 0; + p->start_event_ = 0; } - while (* (np++)); } void -Piano_pedal_performer::create_audio_elements () +Piano_pedal_performer::process_music () { - for (Pedal_info *p = info_alist_; p && p->name_; p++) + Pedal_info *p = info_alist_; + for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++) { - if (p->req_drul_[STOP]) + string pedal_type = pedal_type_str (i); + if (p->event_drul_[STOP]) { - if (!p->start_req_) - { - p->req_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", String (p->name_))); - } + if (!p->start_event_) + p->event_drul_[STOP]->origin ()->warning (_f ("cannot find start of piano pedal: `%s'", pedal_type)); else { Audio_piano_pedal *a = new Audio_piano_pedal; - a->type_string_ = String (p->name_); + a->type_string_ = pedal_type; a->dir_ = STOP; - audios_.push (a); + audios_.push_back (a); + Audio_element_info info (a, p->event_drul_[STOP]); + announce_element (info); } - p->start_req_ = 0; + p->start_event_ = 0; } - if (p->req_drul_[START]) + if (p->event_drul_[START]) { - p->start_req_ = p->req_drul_[START]; + p->start_event_ = p->event_drul_[START]; Audio_piano_pedal *a = new Audio_piano_pedal; - a->type_string_ = String (p->name_); + a->type_string_ = pedal_type; a->dir_ = START; - audios_.push (a); + audios_.push_back (a); + Audio_element_info info (a, p->event_drul_[START]); + announce_element (info); } - p->req_drul_[START] = 0; - p->req_drul_[STOP] = 0; + p->event_drul_[START] = 0; + p->event_drul_[STOP] = 0; } } void Piano_pedal_performer::stop_translation_timestep () { - for (int i = 0; i < audios_.size (); i++) - play_element (audios_[i]); audios_.clear (); } void Piano_pedal_performer::start_translation_timestep () { - for (Pedal_info *p = info_alist_; p && p->name_; p++) + Pedal_info *p = info_alist_; + for (int i = 0; i < NUM_PEDAL_TYPES; i++, p++) { - p->req_drul_[STOP] = 0; - p->req_drul_[START] = 0; + p->event_drul_[STOP] = 0; + p->event_drul_[START] = 0; } } -bool -Piano_pedal_performer::try_music (Music *r) +IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, sostenuto); +void +Piano_pedal_performer::listen_sostenuto (Stream_event *r) { - if (r->is_mus_type ("pedal-event")) - { - for (Pedal_info *p = info_alist_; p->name_; p++) - { - String nm = p->name_ + String ("Event"); - if (ly_is_equal (r->get_property ("name"), - scm_str2symbol (nm.to_str0 ()))) - { - Direction d = to_dir (r->get_property ("span-direction")); - p->req_drul_[d] = r; - return true; - } - } - } - return false; + Direction d = to_dir (r->get_property ("span-direction")); + info_alist_[SOSTENUTO].event_drul_[d] = r; +} + +IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, sustain); +void +Piano_pedal_performer::listen_sustain (Stream_event *r) +{ + Direction d = to_dir (r->get_property ("span-direction")); + info_alist_[SUSTAIN].event_drul_[d] = r; } -ADD_TRANSLATOR (Piano_pedal_performer, "", "", - "pedal-event", - "", "", ""); +IMPLEMENT_TRANSLATOR_LISTENER (Piano_pedal_performer, una_corda); +void +Piano_pedal_performer::listen_una_corda (Stream_event *r) +{ + Direction d = to_dir (r->get_property ("span-direction")); + info_alist_[UNA_CORDA].event_drul_[d] = r; +} + +ADD_TRANSLATOR (Piano_pedal_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + "" + );