source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "performer.hh"
#include "audio-item.hh"
+#include "music.hh"
/*
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);
protected:
- virtual bool try_music (Music*);
+ virtual bool try_music (Music *);
virtual void acknowledge_audio_element (Audio_element_info);
- virtual void process_music ();
- virtual void stop_translation_timestep ();
+ void process_music ();
+ void stop_translation_timestep ();
private:
- Audio_dynamic* audio_;
+ Audio_dynamic *audio_;
Real last_volume_;
- Music* span_start_event_;
- Drul_array<Music*> span_events_;
+ Music *span_start_event_;
+ Drul_array<Music *> span_events_;
Array<Audio_dynamic_tuple> dynamic_tuples_;
Array<Audio_dynamic_tuple> finished_dynamic_tuples_;
Direction dir_;
void
Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i)
{
- if (Audio_dynamic * d = dynamic_cast <Audio_dynamic*> (i.elem_))
- {
- last_volume_ = d->volume_;
- }
+ if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (i.elem_))
+ last_volume_ = d->volume_;
}
void
Audio_dynamic_tuple a = { audio_, now_mom () };
dynamic_tuples_.push (a);
}
-
+
if (span_events_[STOP])
{
if (!span_start_event_)
if (span_events_[START])
{
- dir_ = (span_events_[START]->is_mus_type ("crescendo-event"))
+ dir_ = (span_events_[START]->is_mus_type ("crescendo-event"))
? RIGHT : LEFT;
span_start_event_ = span_events_[START];
-
+
dynamic_tuples_.clear ();
Audio_dynamic_tuple a = { audio_, now_mom () };
dynamic_tuples_.push (a);
}
if (span_events_[STOP])
- {
- finished_dynamic_tuples_.top ().audio_->volume_ = last_volume_;
- }
-
+ finished_dynamic_tuples_.top ().audio_->volume_ = last_volume_;
+
if (span_events_[START])
- {
- dynamic_tuples_[0].audio_->volume_ = last_volume_;
- }
+ dynamic_tuples_[0].audio_->volume_ = last_volume_;
span_events_[START] = 0;
span_events_[STOP] = 0;
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;
+ ().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++)
{
- 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;
span_events_[STOP] = 0;
span_events_[START] = 0;
-
}
bool
-Span_dynamic_performer::try_music (Music* r)
+Span_dynamic_performer::try_music (Music *r)
{
if (r->is_mus_type ("crescendo-event")
|| r->is_mus_type ("decrescendo-event"))
}
return false;
}
+#include "translator.icc"
+
ADD_TRANSLATOR (Span_dynamic_performer,
- "", "",
- "crescendo-event decrescendo-event",
- "", "", "");
+ "", "",
+ "crescendo-event decrescendo-event",
+ "", "");