Merge branch 'issue4032'

[lilypond.git] / lily / partial-iterator.cc

diff --git a/lily/partial-iterator.cc b/lily/partial-iterator.cc
index 37b2b603d55009093819c13f565e7697e98ab5ba..13223297f551c5fa972e1581d94d39595d59b387 100644 (file)
--- a/lily/partial-iterator.cc
+++ b/lily/partial-iterator.cc
@@ -36,7 +36,7 @@ void
 Partial_iterator::process (Moment m)
 {
   if (Duration * dur
-      = unsmob_duration (get_music ()->get_property ("duration")))
+      = Duration::unsmob (get_music ()->get_property ("duration")))
     {
       // Partial_iterator is an iterator rather than an engraver, so
       // the active context it is getting called in does not depend on
@@ -47,7 +47,7 @@ Partial_iterator::process (Moment m)
       // Timing_translator does not set measurePosition when
       // initializing.
 
-      Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
+      Context *timing = Context::unsmob (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
                                                     get_outlet ()->self_scm (),
                                                     ly_symbol2scm ("Timing")));
 
@@ -58,7 +58,7 @@ Partial_iterator::process (Moment m)
           Moment mp = robust_scm2moment (timing->get_property ("measurePosition"),
                                          Rational (0));
 
-          if (mp.main_part_ > Rational (0))
+          if (get_outlet ()->now_mom () > 0)
             mp.main_part_ = measure_length (timing);
           else
             mp.main_part_ = 0;