Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/partial-iterator.cc b/lily/partial-iterator.cc
index 7d1c44fcac88527de11123f128c6320b3a046190..80048d827c87bcec64bdefc0615e041d93409533 100644 (file)
--- a/lily/partial-iterator.cc
+++ b/lily/partial-iterator.cc
@@ -24,6 +24,7 @@
 #include "moment.hh"
 #include "music.hh"
 #include "simple-music-iterator.hh"
+#include "lily-imports.hh"
 
 class Partial_iterator : public Simple_music_iterator
 {
@@ -38,7 +39,7 @@ void
 Partial_iterator::process (Moment m)
 {
   if (Duration * dur
-      = Duration::unsmob (get_music ()->get_property ("duration")))
+      = unsmob<Duration> (get_music ()->get_property ("duration")))
     {
       Moment length = Moment (dur->get_length ());
 
@@ -52,10 +53,9 @@ Partial_iterator::process (Moment m)
       // work since the Timing_translator does not set
       // measurePosition when initializing.
 
-      Context *timing = Context::unsmob
-                        (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
-                                     get_outlet ()->self_scm (),
-                                     ly_symbol2scm ("Timing")));
+      Context *timing = unsmob<Context>
+        (Lily::ly_context_find (get_outlet ()->self_scm (),
+                                ly_symbol2scm ("Timing")));
 
       if (!timing)
         programming_error ("missing Timing in \\partial");
@@ -91,10 +91,8 @@ Partial_iterator::finalization (SCM ctx, SCM length)
 {
   LY_ASSERT_SMOB (Context, ctx, 1);
   LY_ASSERT_SMOB (Moment, length, 2);
-  Context *timing = Context::unsmob
-    (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
-                 ctx,
-                 ly_symbol2scm ("Timing")));
+  Context *timing = unsmob<Context>
+    (Lily::ly_context_find (ctx, ly_symbol2scm ("Timing")));
   if (!timing) {
     programming_error ("missing Timing in \\partial");
     return SCM_UNSPECIFIED;
@@ -103,7 +101,7 @@ Partial_iterator::finalization (SCM ctx, SCM length)
                                  Rational (0));
   mp.main_part_ = measure_length (timing);
   timing->set_property ("measurePosition",
-                        (mp - *Moment::unsmob (length)).smobbed_copy ());
+                        (mp - *unsmob<Moment> (length)).smobbed_copy ());
   timing->unset_property (ly_symbol2scm ("partialBusy"));
 
   return SCM_UNSPECIFIED;