* lily/lily-guile.cc (robust_scm2double): new function. Use throughout.

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

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index aefb86da9c823bc933827f279f6ef5a3703bb7ce..c0df3e0cae6736c5c458d1a3b7dd64b0e491520f 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -52,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
@@ -90,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;
            }
        }