*** empty log message ***

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 4505dbd024a1ce15e785b2a7da9d57235ea42f4d..cc6936a475b0759030d8301065fe87df9783d955 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -46,7 +46,7 @@ Dynamic_performer::create_audio_elements ()
       SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
 
       SCM svolume  = SCM_EOL;
-      if (ly_procedure_p (proc))
+      if (ly_c_procedure_p (proc))
        {
          // urg
          svolume = scm_call_1 (proc, script_req_->get_property ("text"));
@@ -59,13 +59,13 @@ Dynamic_performer::create_audio_elements ()
        */
       SCM min = get_property ("midiMinimumVolume");
       SCM max = get_property ("midiMaximumVolume");
-      if (ly_number_p (min) || ly_number_p (max))
+      if (scm_is_number (min) || scm_is_number (max))
        {
          Interval iv (0, 1);
-         if (ly_number_p (min))
-           iv[MIN] = ly_scm2double (min);
-         if (ly_number_p (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 +75,15 @@ Dynamic_performer::create_audio_elements ()
          */
          SCM s = get_property ("midiInstrument");
          
-         if (!ly_string_p (s))
+         if (!scm_is_string (s))
            s = get_property ("instrument");
          
-         if (!ly_string_p (s))
+         if (!scm_is_string (s))
            s = scm_makfrom0str ("piano");
          
          
          SCM eq = get_property ("instrumentEqualizer");
-         if (ly_procedure_p (eq))
+         if (ly_c_procedure_p (eq))
            {
              s = scm_call_1 (eq, s);
            }