X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-dynamic-performer.cc;h=46a3b3f8cad24b0928c429d8afe1108656a08890;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=44b2547008b8e7c2e28eccd7d3265b4b3a0486c7;hpb=c735173d0ec717e9743a5032ac6a43bbba0da39f;p=lilypond.git diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index 44b2547008..46a3b3f8ca 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -23,58 +23,107 @@ struct Audio_dynamic_tuple class Span_dynamic_performer : public Performer { public: - VIRTUAL_COPY_CONS (Translator); - - Span_dynamic_performer (); + TRANSLATOR_DECLARATIONS(Span_dynamic_performer); protected: - virtual bool do_try_music (Music* req_l); - virtual void acknowledge_element (Audio_element_info); - virtual void do_process_music (); - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); + 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 (); private: Audio_dynamic* audio_p_; + Real last_volume_; Span_req* span_start_req_l_; Drul_array span_req_l_drul_; Array dynamic_tuple_arr_; Array finished_dynamic_tuple_arr_; + Direction dir_; Direction finished_dir_; }; -ADD_THIS_TRANSLATOR (Span_dynamic_performer); - Span_dynamic_performer::Span_dynamic_performer () { span_req_l_drul_[START] = 0; span_req_l_drul_[STOP] = 0; span_start_req_l_ = 0; audio_p_ = 0; + last_volume_ = 0; } void -Span_dynamic_performer::acknowledge_element (Audio_element_info i) +Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i) { if (Audio_dynamic * d = dynamic_cast (i.elem_l_)) { - Audio_dynamic_tuple a = { d, now_mom () }; - if (!span_req_l_drul_[START]) - dynamic_tuple_arr_.clear (); + last_volume_ = d->volume_; + } +} + +void +Span_dynamic_performer::process_music () +{ + if (span_start_req_l_ || span_req_l_drul_[START]) + { + audio_p_ = new Audio_dynamic (0); + Audio_element_info info (audio_p_, span_req_l_drul_[START] + ? span_req_l_drul_[START] + : span_req_l_drul_[STOP]); + announce_element (info); + Audio_dynamic_tuple a = { audio_p_, now_mom () }; + dynamic_tuple_arr_.push (a); + } + + if (span_req_l_drul_[STOP]) + { + if (!span_start_req_l_) + { + span_req_l_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); + span_req_l_drul_[STOP] = 0; + } + else + { + finished_dir_ = dir_; + finished_dynamic_tuple_arr_ = dynamic_tuple_arr_; + } + dynamic_tuple_arr_.clear (); + span_start_req_l_ = 0; + } + + if (span_req_l_drul_[START]) + { + String t = ly_scm2string (span_req_l_drul_[START]->get_mus_property ("span-type")); + dir_ = (t == "crescendo") ? RIGHT : LEFT; + span_start_req_l_ = span_req_l_drul_[START]; + + dynamic_tuple_arr_.clear (); + Audio_dynamic_tuple a = { audio_p_, now_mom () }; dynamic_tuple_arr_.push (a); - if (finished_dynamic_tuple_arr_.size ()) - finished_dynamic_tuple_arr_.push (a); } + + + if (span_req_l_drul_[STOP]) + { + finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_; + } + + if (span_req_l_drul_[START]) + { + dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_; + } + span_start_req_l_ = 0; + span_req_l_drul_[START] = 0; + span_req_l_drul_[STOP] = 0; } void -Span_dynamic_performer::do_process_music () +Span_dynamic_performer::stop_translation_timestep () { - if (finished_dynamic_tuple_arr_.size () > 1 - && finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_) + if (finished_dynamic_tuple_arr_.size () > 1) { - Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_i_; - Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_ + Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_; + Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_ - start_volume; /* urg. @@ -89,57 +138,24 @@ Span_dynamic_performer::do_process_music () */ if (!dv || sign (dv) != finished_dir_) { - // urg. about one volume step - dv = (int)finished_dir_ * 13; + // urg. 20%: about two volume steps + dv = (Real)finished_dir_ * 0.2; if (!start_volume) start_volume = finished_dynamic_tuple_arr_.top - ().audio_l_->volume_i_ - dv; + ().audio_l_->volume_ - dv; } Moment start_mom = finished_dynamic_tuple_arr_[0].mom_; Moment dt = finished_dynamic_tuple_arr_.top ().mom_ - start_mom; for (int i=0; i < finished_dynamic_tuple_arr_.size (); i++) { Audio_dynamic_tuple* a = &finished_dynamic_tuple_arr_[i]; - Real volume = start_volume + dv * (Real)(a->mom_ - start_mom) - / (Real)dt; - a->audio_l_->volume_i_ = (int)volume; + Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_ + / (Real)dt.main_part_; + a->audio_l_->volume_ = volume; } finished_dynamic_tuple_arr_.clear (); } - if (span_req_l_drul_[STOP]) - { - if (!span_start_req_l_) - { - span_req_l_drul_[STOP]->warning (_ ("can't find start of (de)crescendo")); - } - else - { - span_start_req_l_ = 0; - finished_dynamic_tuple_arr_ = dynamic_tuple_arr_; - finished_dir_ = span_req_l_drul_[STOP]->span_type_str_ == "crescendo" - ? RIGHT : LEFT; - dynamic_tuple_arr_.clear (); - if (finished_dynamic_tuple_arr_.size ()) - dynamic_tuple_arr_.push (finished_dynamic_tuple_arr_.top ()); - } - } - - if (span_req_l_drul_[START]) - { - span_start_req_l_ = span_req_l_drul_[START]; - audio_p_ = new Audio_dynamic (0); - Audio_element_info info (audio_p_, 0); - announce_element (info); - - Audio_dynamic_tuple a = { audio_p_, now_mom () }; - dynamic_tuple_arr_.push (a); - } -} - -void -Span_dynamic_performer::do_pre_move_processing () -{ if (audio_p_) { play_element (audio_p_); @@ -148,23 +164,24 @@ Span_dynamic_performer::do_pre_move_processing () } void -Span_dynamic_performer::do_post_move_processing () +Span_dynamic_performer::start_translation_timestep () { span_req_l_drul_[STOP] = 0; span_req_l_drul_[START] = 0; } bool -Span_dynamic_performer::do_try_music (Music* r) +Span_dynamic_performer::try_music (Music* r) { - if (Span_req * s = dynamic_cast(r)) + if (Span_req * s = dynamic_cast (r)) { - if (s-> span_type_str_ == "crescendo" - || s->span_type_str_ == "decrescendo") + String t = ly_scm2string (s->get_mus_property ("span-type")); + if (t == "crescendo" || t == "decrescendo") { - span_req_l_drul_[s->span_dir_] = s; + span_req_l_drul_[s->get_span_dir ()] = s; return true; } } return false; } +ENTER_DESCRIPTION (Span_dynamic_performer, "","","","","" );