*** empty log message ***

[lilypond.git] / lily / multi-measure-rest-engraver.cc

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 2b36fb408f40f8e1f999b422b00d65a2979fbcc8..7a3d1b06aeabcd44af5222a65c32f5f95ce62621 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -130,7 +130,7 @@ Multi_measure_rest_engraver::process_music ()
        }
       
       start_measure_
-       = ly_scm2int (get_property ("currentBarNumber"));
+       = scm_to_int (get_property ("currentBarNumber"));
     }
 
   bar_seen_ = scm_is_string (get_property ("whichBar"));
@@ -209,7 +209,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       last_rest_ = mmrest_;
       last_numbers_ = numbers_;
       
-      int cur = ly_scm2int (get_property ("currentBarNumber"));
+      int cur = scm_to_int (get_property ("currentBarNumber"));
       int num = cur - start_measure_;
 
       /*
@@ -234,7 +234,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
          SCM thres = get_property ("restNumberThreshold");
          int t = 1;
          if (ly_c_number_p (thres))
-           t = ly_scm2int (thres);
+           t = scm_to_int (thres);
       
          if (num <= t)
            last->suicide ();