From: Han-Wen Nienhuys Date: Sun, 7 Jan 2007 01:10:26 +0000 (+0100) Subject: rm files. X-Git-Tag: release/2.10.10-1~21 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54d493f2e87c610968ec4940f796f260d9dd3385;p=lilypond.git rm files. --- diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc deleted file mode 100644 index 0dd4556060..0000000000 --- a/lily/dynamic-performer.cc +++ /dev/null @@ -1,131 +0,0 @@ -/* - dynamic-performer.cc -- implement Dynamic_performer - - source file of the GNU LilyPond music typesetter - - (c) 2000--2006 Jan Nieuwenhuizen -*/ - -#include "performer.hh" - -#include "audio-item.hh" -#include "stream-event.hh" -#include "translator.icc" - -/* - TODO: - - handle multiple events - - perform absolute (text) dynamics -*/ -class Dynamic_performer : public Performer -{ -public: - TRANSLATOR_DECLARATIONS (Dynamic_performer); -protected: - void stop_translation_timestep (); - void process_music (); - - DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); -private: - Stream_event *script_event_; - Audio_dynamic *audio_; -}; - -Dynamic_performer::Dynamic_performer () -{ - script_event_ = 0; - audio_ = 0; -} - -void -Dynamic_performer::process_music () -{ - if (script_event_) - { - SCM proc = get_property ("dynamicAbsoluteVolumeFunction"); - - SCM svolume = SCM_EOL; - if (ly_is_procedure (proc)) - { - // urg - svolume = scm_call_1 (proc, script_event_->get_property ("text")); - } - - Real volume = robust_scm2double (svolume, 0.5); - - /* - properties override default equaliser setting - */ - SCM min = get_property ("midiMinimumVolume"); - SCM max = get_property ("midiMaximumVolume"); - if (scm_is_number (min) || scm_is_number (max)) - { - Interval iv (0, 1); - if (scm_is_number (min)) - iv[MIN] = scm_to_double (min); - if (scm_is_number (max)) - iv[MAX] = scm_to_double (max); - volume = iv[MIN] + iv.length () * volume; - } - else - { - /* - urg, code duplication:: staff_performer - */ - SCM s = get_property ("midiInstrument"); - - if (!scm_is_string (s)) - s = get_property ("instrumentName"); - - if (!scm_is_string (s)) - s = scm_makfrom0str ("piano"); - - SCM eq = get_property ("instrumentEqualizer"); - if (ly_is_procedure (eq)) - s = scm_call_1 (eq, s); - - if (is_number_pair (s)) - { - Interval iv = ly_scm2interval (s); - volume = iv[MIN] + iv.length () * volume; - } - } - - audio_ = new Audio_dynamic (volume); - Audio_element_info info (audio_, script_event_); - announce_element (info); - script_event_ = 0; - } -} - -void -Dynamic_performer::stop_translation_timestep () -{ - if (audio_) - { - audio_ = 0; - } -} - -IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, absolute_dynamic); -void -Dynamic_performer::listen_absolute_dynamic (Stream_event *r) -{ - if (!script_event_) - script_event_ = r; -} - -ADD_TRANSLATOR (Dynamic_performer, - /* doc */ "", - /* create */ "", - - /* read */ - "dynamicAbsoluteVolumeFunction " - "instrumentEqualizer " - "midiMaximumVolume " - "midiMinimumVolume " - "midiInstrument " - , - /*writes*/""); diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc deleted file mode 100644 index 28e2ea675d..0000000000 --- a/lily/span-dynamic-performer.cc +++ /dev/null @@ -1,186 +0,0 @@ -/* - span-dynamic-performer.cc -- implement Span_dynamic_performer - - source file of the GNU LilyPond music typesetter - - (c) 2000--2006 Jan Nieuwenhuizen -*/ - -#include "performer.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_; - Moment mom_; -}; - -/** - perform span-dynamics -*/ -class Span_dynamic_performer : public Performer -{ -public: - TRANSLATOR_DECLARATIONS (Span_dynamic_performer); - -protected: - virtual void acknowledge_audio_element (Audio_element_info); - void process_music (); - void stop_translation_timestep (); - - DECLARE_TRANSLATOR_LISTENER (decrescendo); - DECLARE_TRANSLATOR_LISTENER (crescendo); -private: - Audio_dynamic *audio_; - Real last_volume_; - 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_events_[START] = 0; - span_events_[STOP] = 0; - span_start_event_ = 0; - audio_ = 0; - last_volume_ = 0; -} - -void -Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i) -{ - if (Audio_dynamic *d = dynamic_cast (i.elem_)) - last_volume_ = d->volume_; -} - -void -Span_dynamic_performer::process_music () -{ - if (span_start_event_ || span_events_[START]) - { - audio_ = new Audio_dynamic (0); - 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_back (a); - } - - if (span_events_[STOP]) - { - if (!span_start_event_) - { - span_events_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo")); - span_events_[STOP] = 0; - } - else - { - finished_dir_ = dir_; - finished_dynamic_tuples_ = dynamic_tuples_; - } - dynamic_tuples_.clear (); - span_start_event_ = 0; - } - - if (span_events_[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_back (a); - } - - if (span_events_[STOP]) - finished_dynamic_tuples_.back ().audio_->volume_ = last_volume_; - - if (span_events_[START]) - dynamic_tuples_[0].audio_->volume_ = last_volume_; - - span_events_[START] = 0; - span_events_[STOP] = 0; -} - -void -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_.back ().audio_->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_tuples_.back ().audio_->volume_ - - dv; - } - Moment start_mom = finished_dynamic_tuples_[0].mom_; - 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]; - Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_ - / (Real)dt.main_part_; - a->audio_->volume_ = volume; - } - finished_dynamic_tuples_.clear (); - } - - if (audio_) - { - audio_ = 0; - } - - span_events_[STOP] = 0; - span_events_[START] = 0; -} - -IMPLEMENT_TRANSLATOR_LISTENER (Span_dynamic_performer, decrescendo); -void -Span_dynamic_performer::listen_decrescendo (Stream_event *r) -{ - Direction d = to_dir (r->get_property ("span-direction")); - span_events_[d] = r; -} - -IMPLEMENT_TRANSLATOR_LISTENER (Span_dynamic_performer, crescendo); -void -Span_dynamic_performer::listen_crescendo (Stream_event *r) -{ - Direction d = to_dir (r->get_property ("span-direction")); - span_events_[d] = r; -} - -ADD_TRANSLATOR (Span_dynamic_performer, - "", "", - "", "");