X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-dynamic-performer.cc;h=28e2ea675dc02db45cd1eae079c9ed2cf4da53bd;hb=a9c0c06eca7cf482bd550be17e4a4dbdfc7cc22a;hp=db2523d289fea07b0c3316b86a0b2b7cd169d6d6;hpb=487ee28c2a58e7bd5cb9e85c7676057c0b32f385;p=lilypond.git diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index db2523d289..28e2ea675d 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -3,51 +3,58 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2006 Jan Nieuwenhuizen */ #include "performer.hh" -#include "event.hh" #include "audio-item.hh" +#include "international.hh" +#include "stream-event.hh" +#include "translator.icc" + +/* + TODO: fold this into 1 engraver: \< and \> should also stop when + absdyn is encountered. +*/ struct Audio_dynamic_tuple { - Audio_dynamic* audio_; + Audio_dynamic *audio_; Moment mom_; }; /** perform span-dynamics - */ +*/ class Span_dynamic_performer : public Performer { public: - TRANSLATOR_DECLARATIONS(Span_dynamic_performer); + TRANSLATOR_DECLARATIONS (Span_dynamic_performer); protected: - virtual bool try_music (Music*); virtual void acknowledge_audio_element (Audio_element_info); - virtual void process_music (); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void process_music (); + void stop_translation_timestep (); + DECLARE_TRANSLATOR_LISTENER (decrescendo); + DECLARE_TRANSLATOR_LISTENER (crescendo); private: - Audio_dynamic* audio_; + Audio_dynamic *audio_; Real last_volume_; - Music* span_start_req_; - Drul_array span_req_l_drul_; - Array dynamic_tuples_; - Array finished_dynamic_tuples_; + Stream_event *span_start_event_; + Drul_array span_events_; + vector dynamic_tuples_; + vector finished_dynamic_tuples_; Direction dir_; Direction finished_dir_; }; Span_dynamic_performer::Span_dynamic_performer () { - span_req_l_drul_[START] = 0; - span_req_l_drul_[STOP] = 0; - span_start_req_ = 0; + span_events_[START] = 0; + span_events_[STOP] = 0; + span_start_event_ = 0; audio_ = 0; last_volume_ = 0; } @@ -55,32 +62,30 @@ Span_dynamic_performer::Span_dynamic_performer () void Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i) { - if (Audio_dynamic * d = dynamic_cast (i.elem_)) - { - last_volume_ = d->volume_; - } + if (Audio_dynamic *d = dynamic_cast (i.elem_)) + last_volume_ = d->volume_; } void Span_dynamic_performer::process_music () { - if (span_start_req_ || span_req_l_drul_[START]) + if (span_start_event_ || span_events_[START]) { audio_ = new Audio_dynamic (0); - Audio_element_info info (audio_, span_req_l_drul_[START] - ? span_req_l_drul_[START] - : span_req_l_drul_[STOP]); + Audio_element_info info (audio_, span_events_[START] + ? span_events_[START] + : span_events_[STOP]); announce_element (info); Audio_dynamic_tuple a = { audio_, now_mom () }; - dynamic_tuples_.push (a); + dynamic_tuples_.push_back (a); } - - if (span_req_l_drul_[STOP]) + + if (span_events_[STOP]) { - if (!span_start_req_) + if (!span_start_event_) { - span_req_l_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); - span_req_l_drul_[STOP] = 0; + span_events_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + span_events_[STOP] = 0; } else { @@ -88,33 +93,28 @@ Span_dynamic_performer::process_music () finished_dynamic_tuples_ = dynamic_tuples_; } dynamic_tuples_.clear (); - span_start_req_ = 0; + span_start_event_ = 0; } - if (span_req_l_drul_[START]) + if (span_events_[START]) { - String t = ly_scm2string (span_req_l_drul_[START]->get_mus_property ("span-type")); - dir_ = (t == "crescendo") ? RIGHT : LEFT; - span_start_req_ = span_req_l_drul_[START]; - + dir_ = (span_events_[START]->in_event_class ("crescendo-event")) + ? RIGHT : LEFT; + span_start_event_ = span_events_[START]; + dynamic_tuples_.clear (); Audio_dynamic_tuple a = { audio_, now_mom () }; - dynamic_tuples_.push (a); + dynamic_tuples_.push_back (a); } + if (span_events_[STOP]) + finished_dynamic_tuples_.back ().audio_->volume_ = last_volume_; - if (span_req_l_drul_[STOP]) - { - finished_dynamic_tuples_.top ().audio_->volume_ = last_volume_; - } - - if (span_req_l_drul_[START]) - { - dynamic_tuples_[0].audio_->volume_ = last_volume_; - } - span_start_req_ = 0; - span_req_l_drul_[START] = 0; - span_req_l_drul_[STOP] = 0; + if (span_events_[START]) + dynamic_tuples_[0].audio_->volume_ = last_volume_; + + span_events_[START] = 0; + span_events_[STOP] = 0; } void @@ -123,32 +123,32 @@ Span_dynamic_performer::stop_translation_timestep () if (finished_dynamic_tuples_.size () > 1) { Real start_volume = finished_dynamic_tuples_[0].audio_->volume_; - Real dv = finished_dynamic_tuples_.top ().audio_->volume_ + Real dv = finished_dynamic_tuples_.back ().audio_->volume_ - start_volume; /* urg. Catch and fix the case of: - | | - x| x| - f cresc. -- -- -- -- -- pp + | | + x| x| + f cresc. -- -- -- -- -- pp - Actually, we should provide a non-displayed dynamic/volume setting, - to set volume to 'ff' just before the pp. - */ + Actually, we should provide a non-displayed dynamic/volume setting, + to set volume to 'ff' just before the pp. + */ if (!dv || sign (dv) != finished_dir_) { // urg. 20%: about two volume steps dv = (Real)finished_dir_ * 0.2; if (!start_volume) - start_volume = finished_dynamic_tuples_.top - ().audio_->volume_ - dv; + start_volume = finished_dynamic_tuples_.back ().audio_->volume_ + - dv; } Moment start_mom = finished_dynamic_tuples_[0].mom_; - Moment dt = finished_dynamic_tuples_.top ().mom_ - start_mom; - for (int i=0; i < finished_dynamic_tuples_.size (); i++) + Moment dt = finished_dynamic_tuples_.back ().mom_ - start_mom; + for (vsize i = 0; i < finished_dynamic_tuples_.size (); i++) { - Audio_dynamic_tuple* a = &finished_dynamic_tuples_[i]; + Audio_dynamic_tuple *a = &finished_dynamic_tuples_[i]; Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_ / (Real)dt.main_part_; a->audio_->volume_ = volume; @@ -158,30 +158,29 @@ Span_dynamic_performer::stop_translation_timestep () if (audio_) { - play_element (audio_); audio_ = 0; } + + span_events_[STOP] = 0; + span_events_[START] = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Span_dynamic_performer, decrescendo); void -Span_dynamic_performer::start_translation_timestep () +Span_dynamic_performer::listen_decrescendo (Stream_event *r) { - span_req_l_drul_[STOP] = 0; - span_req_l_drul_[START] = 0; + Direction d = to_dir (r->get_property ("span-direction")); + span_events_[d] = r; } -bool -Span_dynamic_performer::try_music (Music* r) +IMPLEMENT_TRANSLATOR_LISTENER (Span_dynamic_performer, crescendo); +void +Span_dynamic_performer::listen_crescendo (Stream_event *r) { - if (r->is_mus_type ("dynamic-event")) // fixme. - { - Direction d = to_dir (r->get_mus_property ("span-direction")); - span_req_l_drul_[d] = r; - return true; - } - return false; + Direction d = to_dir (r->get_property ("span-direction")); + span_events_[d] = r; } -ENTER_DESCRIPTION (Span_dynamic_performer, - "", "", - "dynamic-event", - "", "", ""); + +ADD_TRANSLATOR (Span_dynamic_performer, + "", "", + "", "");