2003 -> 2004

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 28e3dbf9fe6ba1a45469777594f787a06dd6b830..a00139574cd61e3408f234278512fa81784b9ceb 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,21 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 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
 {
@@ -33,8 +32,6 @@ private:
   Audio_dynamic* audio_;
 };
 
-
-
 Dynamic_performer::Dynamic_performer ()
 {
   script_req_ = 0;
@@ -55,9 +52,7 @@ Dynamic_performer::create_audio_elements ()
          svolume = gh_call1 (proc, script_req_->get_mus_property ("text"));
        }
 
-      Real volume = 0.5; 
-      if (gh_number_p (svolume))
-       volume = gh_scm2double (svolume);
+      Real volume = robust_scm2double (svolume, 0.5); 
 
       /*
        properties override default equaliser setting
@@ -84,7 +79,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");
@@ -93,11 +88,9 @@ Dynamic_performer::create_audio_elements ()
              s = gh_call1 (eq, s);
            }
 
-         if (gh_pair_p (s))
+         if (is_number_pair (s))
            {
-             Interval iv;
-             iv[MIN] = gh_scm2double (ly_car (s));
-             iv[MAX] = gh_scm2double (ly_cdr (s));
+             Interval iv = ly_scm2interval (s);
              volume = iv[MIN] + iv.length () * volume;
            }
        }
@@ -124,8 +117,7 @@ Dynamic_performer::try_music (Music* r)
 {
   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_ = r;
          return true;
@@ -135,4 +127,9 @@ Dynamic_performer::try_music (Music* r)
 }
 
 ENTER_DESCRIPTION(Dynamic_performer,
-                 "","","","dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer","");
+                 /*descr*/               "",
+                 /* creats*/ "",
+                 /* accepts */     "absolute-dynamic-event",
+                 /* acks */ "",
+                 /*reads */"dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
+                 /*writes*/"");