* lily/include/music.hh (class Music): unvirtualize transpose().

[lilypond.git] / lily / timing-translator.cc

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index e7f56fc63c5d08eece335c5e7eb82fcf30cd05d4..3c445645d0e766e84e38b63c3bf3671b8757d487 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -7,14 +7,13 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "warn.hh"
 #include "timing-translator.hh"
 
+#include "warn.hh"
 #include "translator-group.hh"
 #include "global-context.hh"
 #include "multi-measure-rest.hh"
 
-
 void
 Timing_translator::stop_translation_timestep ()
 {
@@ -49,18 +48,18 @@ Timing_translator::initialize ()
   /*
     move this to engraver-init.ly? 
    */
-  daddy_context_->add_alias (ly_symbol2scm ("Timing"));
-  daddy_context_->set_property ("timing" , SCM_BOOL_T);  
-  daddy_context_->set_property ("currentBarNumber" , scm_int2num (1));
+  context ()->add_alias (ly_symbol2scm ("Timing"));
+  context ()->set_property ("timing" , SCM_BOOL_T);  
+  context ()->set_property ("currentBarNumber" , scm_int2num (1));
 
-  daddy_context_->set_property ("timeSignatureFraction",
+  context ()->set_property ("timeSignatureFraction",
                                scm_cons (scm_int2num (4), scm_int2num (4)));
   /*
     Do not init measurePosition; this should be done from global
     context.
    */
-  daddy_context_->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
-  daddy_context_->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
+  context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
+  context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
 }
 
 Rational
@@ -83,7 +82,7 @@ Timing_translator::measure_position () const
 {
   SCM sm = get_property ("measurePosition");
   
-  Moment m   =0;
+  Moment m   = 0;
   if (unsmob_moment (sm))
     {
       m = *unsmob_moment (sm);
@@ -97,7 +96,7 @@ Timing_translator::measure_position () const
 void
 Timing_translator::start_translation_timestep ()
 {
-  Global_context *global =get_global_context ();
+  Global_context *global = get_global_context ();
 
   Moment now = global->now_mom ();
   Moment dt = now  - global->previous_moment ();
@@ -125,21 +124,21 @@ Timing_translator::start_translation_timestep ()
   else
     {
       measposp = now;
-      daddy_context_->set_property ("measurePosition",
-                                   measposp.smobbed_copy ());
+      context ()->set_property ("measurePosition",
+                               measposp.smobbed_copy ());
     }
   
   measposp += dt;
   
   SCM barn = get_property ("currentBarNumber");
   int b = 0;
-  if (ly_number_p (barn))
+  if (scm_is_number (barn))
     {
-      b = ly_scm2int (barn);
+      b = scm_to_int (barn);
     }
 
   SCM cad = get_property ("timing");
-  bool c= to_boolean (cad);
+  bool c = to_boolean (cad);
 
   Rational len = measure_length ();
   while (c && measposp.main_part_ >= len)
@@ -148,11 +147,11 @@ Timing_translator::start_translation_timestep ()
       b ++;
     }
 
-  daddy_context_->set_property ("currentBarNumber", scm_int2num (b));
-  daddy_context_->set_property ("measurePosition", measposp.smobbed_copy ());
+  context ()->set_property ("currentBarNumber", scm_int2num (b));
+  context ()->set_property ("measurePosition", measposp.smobbed_copy ());
 }
 
-ENTER_DESCRIPTION (Timing_translator,
+ADD_TRANSLATOR (Timing_translator,
                   "This engraver adds the alias "
                   "@code{Timing} to its containing context."
                   ,