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"
+#include "stream-event.hh"
+#include "translator.icc"
/*
TODO:
public:
TRANSLATOR_DECLARATIONS (Dynamic_performer);
protected:
- virtual bool try_music (Music *req);
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
- virtual void create_audio_elements ();
+ void stop_translation_timestep ();
+ void process_music ();
+ DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
private:
- Music *script_req_;
+ Stream_event *script_event_;
Audio_dynamic *audio_;
};
Dynamic_performer::Dynamic_performer ()
{
- script_req_ = 0;
+ script_event_ = 0;
audio_ = 0;
}
void
-Dynamic_performer::create_audio_elements ()
+Dynamic_performer::process_music ()
{
- if (script_req_)
+ if (script_event_)
{
SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
if (ly_is_procedure (proc))
{
// urg
- svolume = scm_call_1 (proc, script_req_->get_property ("text"));
+ svolume = scm_call_1 (proc, script_event_->get_property ("text"));
}
Real volume = robust_scm2double (svolume, 0.5);
SCM s = get_property ("midiInstrument");
if (!scm_is_string (s))
- s = get_property ("instrument");
+ 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);
- }
+ s = scm_call_1 (eq, s);
if (is_number_pair (s))
{
}
audio_ = new Audio_dynamic (volume);
- Audio_element_info info (audio_, script_req_);
+ Audio_element_info info (audio_, script_event_);
announce_element (info);
- script_req_ = 0;
+ script_event_ = 0;
}
}
{
if (audio_)
{
- play_element (audio_);
audio_ = 0;
}
}
-bool
-Dynamic_performer::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, absolute_dynamic);
+void
+Dynamic_performer::listen_absolute_dynamic (Stream_event *r)
{
- if (!script_req_)
- {
- if (r->is_mus_type ("absolute-dynamic-event")) // fixme.
- {
- script_req_ = r;
- return true;
- }
- }
- return false;
+ if (!script_event_)
+ script_event_ = r;
}
-#include "translator.icc"
-
ADD_TRANSLATOR (Dynamic_performer,
- /*descr*/ "",
- /* creats*/ "",
- /* accepts */ "absolute-dynamic-event",
- /* acks */ "",
- /*reads */"dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
+ /* doc */ "",
+ /* create */ "",
+
+ /* read */
+ "dynamicAbsoluteVolumeFunction "
+ "instrumentEqualizer "
+ "midiMaximumVolume "
+ "midiMinimumVolume "
+ "midiInstrument "
+ ,
/*writes*/"");