X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=67c2ffeed1a34fded9052512ed206bac5abb53c8;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=a041bfff843c444344aa2ac3522d80dcd7e394a0;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index a041bfff84..67c2ffeed1 100644
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -23,6 +23,7 @@
 #include "translator-group.hh"
 #include "global-context.hh"
 #include "moment.hh"
+#include "lily-imports.hh"
 
 void
 Timing_translator::stop_translation_timestep ()
@@ -47,9 +48,8 @@ Timing_translator::stop_translation_timestep ()
 void
 Timing_translator::initialize ()
 {
-  Context *timing = unsmob<Context> (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
-                                                context ()->self_scm (),
-                                                ly_symbol2scm ("Timing")));
+  Context *timing = unsmob<Context>
+    (Lily::ly_context_find (context ()->self_scm (), ly_symbol2scm ("Timing")));
   if (timing != context ())
     {
       context ()->add_alias (ly_symbol2scm ("Timing"));
@@ -96,21 +96,15 @@ Timing_translator::initialize ()
   if (!scm_is_pair (timeSignatureSettings))
     {
       programming_error ("missing timeSignatureSettings");
-      // A memoized constant is not the prettiest thing as a fallback
-      // since it does not track changes of the variable.  However,
-      // this is still better than nothing, and we already complained
-      // via a programming_error
-      timeSignatureSettings = ly_lily_module_constant ("default-time-signature-settings");
+      timeSignatureSettings = Lily::default_time_signature_settings;
     }
   context ()->set_property ("timeSignatureSettings", timeSignatureSettings);
 
   SCM beamExceptions = timing->get_property ("beamExceptions");
   if (!scm_is_pair (beamExceptions))
     {
-      beamExceptions =
-        scm_call_2 (ly_lily_module_constant ("beam-exceptions"),
-                    timeSignatureFraction,
-                    timeSignatureSettings);
+      beamExceptions = Lily::beam_exceptions (timeSignatureFraction,
+                                              timeSignatureSettings);
     }
   context ()->set_property ("beamExceptions", beamExceptions);
 
@@ -119,9 +113,8 @@ Timing_translator::initialize ()
     {
       baseMoment =
         Moment (ly_scm2rational
-                (scm_call_2 (ly_lily_module_constant ("base-length"),
-                             timeSignatureFraction,
-                             timeSignatureSettings))).smobbed_copy ();
+                (Lily::base_length (timeSignatureFraction,
+                                    timeSignatureSettings))).smobbed_copy ();
     }
   context ()->set_property ("baseMoment", baseMoment);
 
@@ -129,10 +122,9 @@ Timing_translator::initialize ()
   if (!scm_is_pair (beatStructure))
     {
       beatStructure =
-        scm_call_3 (ly_lily_module_constant ("beat-structure"),
-                    ly_rational2scm (unsmob<Moment> (baseMoment)->main_part_),
-                    timeSignatureFraction,
-                    timeSignatureSettings);
+        Lily::beat_structure (ly_rational2scm (unsmob<Moment> (baseMoment)->main_part_),
+                              timeSignatureFraction,
+                              timeSignatureSettings);
     }
   context ()->set_property ("beatStructure", beatStructure);
 
@@ -153,7 +145,8 @@ Timing_translator::measure_length () const
     return Rational (1);
 }
 
-Timing_translator::Timing_translator ()
+Timing_translator::Timing_translator (Context *c)
+  : Translator (c)
 {
 }
 
@@ -231,6 +224,12 @@ Timing_translator::start_translation_timestep ()
 
 #include "translator.icc"
 
+void
+Timing_translator::boot ()
+{
+
+}
+
 ADD_TRANSLATOR (Timing_translator,
                 /* doc */
                 "This engraver adds the alias @code{Timing} to its containing"