* Another grand 2003 update.

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index d69c38f0f5a77c24f1476c026f449bb01b645436..aefb86da9c823bc933827f279f6ef5a3703bb7ce 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,51 +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:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Dynamic_performer ();
-
+  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_grobs ();
+  virtual void create_audio_elements ();
 
 private:
-  Music* script_req_l_;
-  Audio_dynamic* audio_p_;
+  Music* script_req_;
+  Audio_dynamic* audio_;
 };
 
-ADD_THIS_TRANSLATOR (Dynamic_performer);
-
 Dynamic_performer::Dynamic_performer ()
 {
-  script_req_l_ = 0;
-  audio_p_ = 0;
+  script_req_ = 0;
+  audio_ = 0;
 }
 
 void
-Dynamic_performer::create_grobs ()
+Dynamic_performer::create_audio_elements ()
 {
-  if (script_req_l_)
+  if (script_req_)
     {
       SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
 
@@ -55,7 +49,7 @@ Dynamic_performer::create_grobs ()
       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; 
@@ -83,11 +77,11 @@ Dynamic_performer::create_grobs ()
          */
          SCM s = get_property ("midiInstrument");
          
-         if (!gh_string_p(s))
+         if (!gh_string_p (s))
            s = get_property ("instrument");
          
-         if (!gh_string_p(s))
-           s = ly_str02scm ("piano");
+         if (!gh_string_p (s))
+           s = scm_makfrom0str ("piano");
          
          
          SCM eq = get_property ("instrumentEqualizer");
@@ -99,41 +93,47 @@ Dynamic_performer::create_grobs ()
          if (gh_pair_p (s))
            {
              Interval iv;
-             iv[MIN] = gh_scm2double (gh_car (s));
-             iv[MAX] = gh_scm2double (gh_cdr (s));
+             iv[MIN] = gh_scm2double (ly_car (s));
+             iv[MAX] = gh_scm2double (ly_cdr (s));
              volume = iv[MIN] + iv.length () * volume;
            }
        }
       
-      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;
        }
     }
   return false;
 }
 
+ENTER_DESCRIPTION(Dynamic_performer,
+                 /*descr*/               "",
+                 /* creats*/ "",
+                 /* accepts */     "absolute-dynamic-event",
+                 /* acks */ "",
+                 /*reads */"dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
+                 /*writes*/"");