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_requests ();
- virtual void do_pre_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_;
- Drul_array<Span_req*> request_drul_;
+ Real last_volume_;
+ Span_req* span_start_req_l_;
+ Drul_array<Span_req*> span_req_l_drul_;
Array<Audio_dynamic_tuple> dynamic_tuple_arr_;
Array<Audio_dynamic_tuple> finished_dynamic_tuple_arr_;
+ Direction dir_;
Direction finished_dir_;
};
-ADD_THIS_TRANSLATOR (Span_dynamic_performer);
-
Span_dynamic_performer::Span_dynamic_performer ()
{
- request_drul_[START] = request_drul_[STOP] = 0;
+ 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 <Audio_dynamic*> (i.elem_l_))
{
- Audio_dynamic_tuple a = { d, now_mom () };
- if (!request_drul_[START])
- dynamic_tuple_arr_.clear ();
- dynamic_tuple_arr_.push (a);
- if (finished_dynamic_tuple_arr_.size ())
- finished_dynamic_tuple_arr_.push (a);
+ last_volume_ = d->volume_;
}
}
void
-Span_dynamic_performer::do_process_requests ()
+Span_dynamic_performer::process_music ()
{
- if (finished_dynamic_tuple_arr_.size () > 1
- && finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_)
+ if (span_start_req_l_ || span_req_l_drul_[START])
{
- Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_i_;
- Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_
- - start_volume;
- if (!dv)
+ 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_)
{
- // urg. about one volume step
- dv = (int)finished_dir_ * 13;
- if (!start_volume)
- start_volume = finished_dynamic_tuple_arr_.top
- ().audio_l_->volume_i_ - dv;
+ span_req_l_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+ span_req_l_drul_[STOP] = 0;
}
- 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++)
+ else
{
- 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;
+ finished_dir_ = dir_;
+ finished_dynamic_tuple_arr_ = dynamic_tuple_arr_;
}
- finished_dynamic_tuple_arr_.clear ();
+ dynamic_tuple_arr_.clear ();
+ span_start_req_l_ = 0;
}
- if (request_drul_[STOP])
+ if (span_req_l_drul_[START])
{
- finished_dynamic_tuple_arr_ = dynamic_tuple_arr_;
- finished_dir_ = request_drul_[STOP]->span_type_str_ == "crescendo"
- ? RIGHT : LEFT;
+ 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 ();
- if (finished_dynamic_tuple_arr_.size ())
- dynamic_tuple_arr_.push (finished_dynamic_tuple_arr_.top ());
- request_drul_[STOP] = 0;
- request_drul_[START] = 0;
+ Audio_dynamic_tuple a = { audio_p_, now_mom () };
+ dynamic_tuple_arr_.push (a);
}
- if (request_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);
+ 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_pre_move_processing ()
+Span_dynamic_performer::stop_translation_timestep ()
{
+ if (finished_dynamic_tuple_arr_.size () > 1)
+ {
+ Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_;
+ Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_
+ - start_volume;
+ /*
+ urg.
+ Catch and fix the case of:
+
+ | |
+ x| x|
+ f cresc. -- -- -- -- -- 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_tuple_arr_.top
+ ().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).main_part_
+ / (Real)dt.main_part_;
+ a->audio_l_->volume_ = volume;
+ }
+ finished_dynamic_tuple_arr_.clear ();
+ }
+
if (audio_p_)
{
play_element (audio_p_);
}
}
+void
+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<Span_req*>(r))
+ if (Span_req * s = dynamic_cast<Span_req*> (r))
{
- if (s-> span_type_str_ != "crescendo"
- && s->span_type_str_ != "decrescendo")
- return false;
-
- Direction d = s->span_dir_;
-
- if (d == STOP && !request_drul_[START])
+ String t = ly_scm2string (s->get_mus_property ("span-type"));
+ if (t == "crescendo" || t == "decrescendo")
{
- r->warning (_ ("No (de)crescendo to end"));
- return false;
+ span_req_l_drul_[s->get_span_dir ()] = s;
+ return true;
}
- request_drul_[d] = s;
- return true;
}
return false;
}
+ENTER_DESCRIPTION (Span_dynamic_performer, "","","","","" );
projects / lilypond.git / blobdiff