(scm_from_double): more compat glue.

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 53e8a5e0d4392475d8a26eb9c49b0a4dbe4da1d7..7f6008cb798ce54a4390fc7b8fbb48541493093a 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -59,13 +59,13 @@ Dynamic_performer::create_audio_elements ()
        */
       SCM min = get_property ("midiMinimumVolume");
       SCM max = get_property ("midiMaximumVolume");
-      if (is_number (min) || is_number (max))
+      if (ly_c_number_p (min) || ly_c_number_p (max))
        {
          Interval iv (0, 1);
-         if (is_number (min))
-           iv[MIN] = ly_scm2double (min);
-         if (is_number (max))
-           iv[MAX] = ly_scm2double (max);
+         if (ly_c_number_p (min))
+           iv[MIN] = scm_to_double (min);
+         if (ly_c_number_p (max))
+           iv[MAX] = scm_to_double (max);
          volume = iv[MIN] + iv.length () * volume;
        }
       else
@@ -75,10 +75,10 @@ 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");