* Another grand 2003 update.

[lilypond.git] / lily / dynamic-performer.cc

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index a08c500dce4db9f35e52a867e5a07a7942afabbd..aefb86da9c823bc933827f279f6ef5a3703bb7ce 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,48 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
+#include "event.hh"
 #include "audio-item.hh"
 
 /*
   TODO:
-    handle multiple requests
- */
+  
+    handle multiple events
 
-/**
-   perform absolute (text) dynamics
+    perform absolute (text) dynamics
  */
 class Dynamic_performer : public Performer
 {
 public:
   TRANSLATOR_DECLARATIONS(Dynamic_performer);
 protected:
-  virtual bool try_music (Music* req_l);
+  virtual bool try_music (Music* req);
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
 
 private:
-  Music* script_req_l_;
-  Audio_dynamic* audio_p_;
+  Music* script_req_;
+  Audio_dynamic* audio_;
 };
 
-
-
 Dynamic_performer::Dynamic_performer ()
 {
-  script_req_l_ = 0;
-  audio_p_ = 0;
+  script_req_ = 0;
+  audio_ = 0;
 }
 
 void
 Dynamic_performer::create_audio_elements ()
 {
-  if (script_req_l_)
+  if (script_req_)
     {
       SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
 
@@ -52,7 +49,7 @@ Dynamic_performer::create_audio_elements ()
       if (gh_procedure_p (proc))
        {
          // urg
-         svolume = gh_call1 (proc, script_req_l_->get_mus_property ("text"));
+         svolume = gh_call1 (proc, script_req_->get_mus_property ("text"));
        }
 
       Real volume = 0.5; 
@@ -84,7 +81,7 @@ Dynamic_performer::create_audio_elements ()
            s = get_property ("instrument");
          
          if (!gh_string_p (s))
-           s = ly_str02scm ("piano");
+           s = scm_makfrom0str ("piano");
          
          
          SCM eq = get_property ("instrumentEqualizer");
@@ -102,32 +99,31 @@ Dynamic_performer::create_audio_elements ()
            }
        }
       
-      audio_p_ = new Audio_dynamic (volume);
-      Audio_element_info info (audio_p_, script_req_l_);
+      audio_ = new Audio_dynamic (volume);
+      Audio_element_info info (audio_, script_req_);
       announce_element (info);
-      script_req_l_ = 0;
+      script_req_ = 0;
     }
 }
 
 void
 Dynamic_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
 }
 
 bool
 Dynamic_performer::try_music (Music* r)
 {
-  if (!script_req_l_)
+  if (!script_req_)
     {
-      if (dynamic_cast <Text_script_req*> (r)
-         && r->get_mus_property ("text-type") == ly_symbol2scm ("dynamic"))
+      if (r->is_mus_type ("absolute-dynamic-event")) // fixme.
        {
-         script_req_l_ = r;
+         script_req_ = r;
          return true;
        }
     }
@@ -135,4 +131,9 @@ Dynamic_performer::try_music (Music* r)
 }
 
 ENTER_DESCRIPTION(Dynamic_performer,
-                 "","","","","");
+                 /*descr*/               "",
+                 /* creats*/ "",
+                 /* accepts */     "absolute-dynamic-event",
+                 /* acks */ "",
+                 /*reads */"dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
+                 /*writes*/"");