X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-performer.cc;h=b3c2aefd589840457f93167a3d81855a3c4b3bac;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=4cf4415f0300fcf1be4fe3401a4e9e246d73c973;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 4cf4415f03..b3c2aefd58 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -1,16 +1,32 @@ /* - piano-pedal-performer.cc -- implement Piano_pedal_performer + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2014 Jan Nieuwenhuizen - (c) 2000--2006 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 "performer.hh" #include "audio-item.hh" #include "international.hh" -#include "music.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" + +enum Pedal_type {SOSTENUTO, SUSTAIN, UNA_CORDA, NUM_PEDAL_TYPES}; /** perform Piano pedals @@ -19,89 +35,95 @@ class Piano_pedal_performer : public Performer { struct Pedal_info { - char const *name_; - Music *start_event_; - Drul_array event_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 *); + 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__Audio_piano_pedal_ 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->event_drul_[START] = 0; p->event_drul_[STOP] = 0; p->start_event_ = 0; - - p++; } - while (* (np++)); } void 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++) { + string pedal_type = pedal_type_str (i); if (p->event_drul_[STOP]) - { - if (!p->start_event_) - p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", std::string (p->name_))); - else - { - Audio_piano_pedal *a = new Audio_piano_pedal; - a->type_string_ = std::string (p->name_); - a->dir_ = STOP; - audios_.push_back (a); - Audio_element_info info(a, p->event_drul_[STOP]); + { + 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_ = pedal_type; + a->dir_ = STOP; + audios_.push_back (a); + Audio_element_info info (a, p->event_drul_[STOP]); announce_element (info); - } - p->start_event_ = 0; - } + } + p->start_event_ = 0; + } if (p->event_drul_[START]) - { - p->start_event_ = p->event_drul_[START]; - Audio_piano_pedal *a = new Audio_piano_pedal; - a->type_string_ = std::string (p->name_); - a->dir_ = START; - audios_.push_back (a); - Audio_element_info info(a, p->event_drul_[START]); + { + p->start_event_ = p->event_drul_[START]; + Audio_piano_pedal *a = new Audio_piano_pedal; + a->type_string_ = pedal_type; + a->dir_ = START; + audios_.push_back (a); + Audio_element_info info (a, p->event_drul_[START]); announce_element (info); - } + } p->event_drul_[START] = 0; p->event_drul_[STOP] = 0; } @@ -110,43 +132,54 @@ Piano_pedal_performer::process_music () void Piano_pedal_performer::stop_translation_timestep () { - for (vsize 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->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++) - { - std::string nm = p->name_ + std::string ("Event"); - if (ly_is_equal (r->get_property ("name"), - scm_str2symbol (nm.c_str ()))) - { - Direction d = to_dir (r->get_property ("span-direction")); - p->event_drul_[d] = r; - return true; - } - } - } - return false; + Direction d = to_dir (r->get_property ("span-direction")); + info_alist_[SOSTENUTO].event_drul_[d] = r; } -#include "translator.icc" +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; +} + +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 */ + "", -ADD_TRANSLATOR (Piano_pedal_performer, "", "", - "pedal-event", - "", ""); + /* write */ + "" + );