* 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 e8e2bab12a527904d7e2294cac093b969ffb6937..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"
 
 /*
@@ -59,13 +57,13 @@ Dynamic_performer::create_audio_elements ()
        */
       SCM min = get_property ("midiMinimumVolume");
       SCM max = get_property ("midiMaximumVolume");
-      if (ly_c_number_p (min) || ly_c_number_p (max))
+      if (scm_is_number (min) || scm_is_number (max))
        {
          Interval iv (0, 1);
-         if (ly_c_number_p (min))
-           iv[MIN] = ly_scm2double (min);
-         if (ly_c_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
@@ -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",