* buildscripts/mf-to-table.py (base): remove AFM support.

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 1b3aa246ee4ecb48591ff987c7cb19eb1a1853de..f6885b554b94f63338043adb6d7f7d47f0093fbe 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -7,8 +7,6 @@
 */
 
 #include "performer.hh"
-
-#include "event.hh"
 #include "audio-item.hh"
 
 /*
@@ -46,7 +44,7 @@ Dynamic_performer::create_audio_elements ()
       SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
 
       SCM svolume  = SCM_EOL;
-      if (is_procedure (proc))
+      if (ly_c_procedure_p (proc))
        {
          // urg
          svolume = scm_call_1 (proc, script_req_->get_property ("text"));
@@ -59,13 +57,13 @@ Dynamic_performer::create_audio_elements ()
        */
       SCM min = get_property ("midiMinimumVolume");
       SCM max = get_property ("midiMaximumVolume");
-      if (is_number (min) || is_number (max))
+      if (scm_is_number (min) || scm_is_number (max))
        {
          Interval iv (0, 1);
-         if (is_number (min))
-           iv[MIN] = ly_scm2double (min);
-         if (is_number (max))
-           iv[MAX] = ly_scm2double (max);
+         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
@@ -75,15 +73,15 @@ Dynamic_performer::create_audio_elements ()
          */
          SCM s = get_property ("midiInstrument");
          
-         if (!ly_c_string_p (s))
+         if (!scm_is_string (s))
            s = get_property ("instrument");
          
-         if (!ly_c_string_p (s))
+         if (!scm_is_string (s))
            s = scm_makfrom0str ("piano");
          
          
          SCM eq = get_property ("instrumentEqualizer");
-         if (is_procedure (eq))
+         if (ly_c_procedure_p (eq))
            {
              s = scm_call_1 (eq, s);
            }
@@ -126,7 +124,7 @@ Dynamic_performer::try_music (Music* r)
   return false;
 }
 
-ENTER_DESCRIPTION (Dynamic_performer,
+ADD_TRANSLATOR (Dynamic_performer,
                  /*descr*/               "",
                  /* creats*/ "",
                  /* accepts */     "absolute-dynamic-event",