2003 -> 2004

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index d90e93cec7da8aa322edb4aaf747de8722f9fc31..64be59c4f838c902c1df87c1efe821baee320204 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -4,58 +4,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "debug.hh"
+#include "warn.hh"
 #include "timing-translator.hh"
-#include "command-request.hh"
+
 #include "translator-group.hh"
 #include "global-translator.hh"
 #include "multi-measure-rest.hh"
 
-/*
-  TODO: change the rest of lily, so communication with
-  Timing_translator is only done through properties.  This means the
-  class declaration can go here.  */
-bool
-Timing_translator::try_music (Music*r)
-{
-  if (dynamic_cast<Barcheck_req*> (r))
-    {
-      check_ = r;
-      return true;
-    }
-  return false;
-}
-
-void
-Timing_translator::process_music ()
-{
-  if (check_ && measure_position ().main_part_)
-    {
-      check_->origin ()->warning (_f ("barcheck failed at: %s", 
-                                     measure_position ().str ()));
-      Moment zero; 
-      
-      if (!to_boolean (get_property ("barCheckNoSynchronize")))
-       daddy_trans_l_->set_property ("measurePosition", zero.smobbed_copy ());
-    }
-}
 
 void
 Timing_translator::stop_translation_timestep ()
 {
-  check_ = 0;
-  
   Translator *t = this;
-  Global_translator *global_l =0;
+  Global_translator *global =0;
   do
     {
-      t = t->daddy_trans_l_ ;
-      global_l = dynamic_cast<Global_translator*> (t);
+      t = t->daddy_trans_ ;
+      global = dynamic_cast<Global_translator*> (t);
     }
-  while (!global_l);
+  while (!global);
 
   /* allbars == ! skipbars */
   SCM sb = get_property ("skipBars");
@@ -67,27 +37,34 @@ Timing_translator::stop_translation_timestep ()
   if (timb && allbars)
     {
       Moment barleft = (measure_length () - measure_position ());
-
-      if (barleft > Moment (0))
-       global_l->add_moment_to_process (now_mom () + barleft);
+      Moment now = now_mom ();
+
+      if (barleft > Moment (0)
+         /*
+           Hmm. We insert the bar moment every time we process a
+           moment.  A waste of cpu?
+          */
+         && !now.grace_part_)
+       global->add_moment_to_process (now + barleft);
     }
 }
 
-
-ADD_THIS_TRANSLATOR (Timing_translator);
-
 void
 Timing_translator::initialize ()
 {
-  Moment m;
-  daddy_trans_l_->set_property ("timing" , SCM_BOOL_T);  
-  daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1));
-  daddy_trans_l_->set_property ("measurePosition", m.smobbed_copy ());
-  daddy_trans_l_->set_property ("timeSignatureFraction",
-                               gh_cons (gh_int2scm (4), gh_int2scm (4)));
 
-  daddy_trans_l_->set_property ("measureLength", Moment (1).smobbed_copy ());
-  daddy_trans_l_->set_property ("beatLength", Moment (1,4).smobbed_copy ());
+  /*
+    move this to engraver-init.ly? 
+   */
+ 
+  daddy_trans_->set_property ("timing" , SCM_BOOL_T);  
+  daddy_trans_->set_property ("currentBarNumber" , gh_int2scm (1));
+
+  daddy_trans_->set_property ("timeSignatureFraction",
+                               gh_cons (gh_int2scm (4), gh_int2scm (4)));
+  daddy_trans_->set_property ("measurePosition", Moment (Rational (0)).smobbed_copy ());
+  daddy_trans_->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
+  daddy_trans_->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
 }
 
 Rational
@@ -124,22 +101,27 @@ Timing_translator::measure_position () const
 void
 Timing_translator::start_translation_timestep ()
 {
-  check_ = 0;
   Translator *t = this;
-  Global_translator *global_l =0;
+  Global_translator *global =0;
   do
     {
-      t = t->daddy_trans_l_ ;
-      global_l = dynamic_cast<Global_translator*> (t);
+      t = t->daddy_trans_ ;
+      global = dynamic_cast<Global_translator*> (t);
     }
-  while (!global_l);
+  while (!global);
 
-  Moment dt = global_l->now_mom_  - global_l -> prev_mom_;
+  Moment now = global->now_mom_;
+  Moment dt = now  - global -> prev_mom_;
   if (dt < Moment (0))
     {
       programming_error ("Moving backwards in time");
       dt = 0;
     }
+  else if (dt.main_part_.is_infinity ())
+    {
+      programming_error ("Moving infinitely to future");
+      dt = 0;
+    }
   
   if (!dt.to_bool ())
     return;
@@ -153,7 +135,8 @@ Timing_translator::start_translation_timestep ()
     }
   else
     {
-      daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ());
+      measposp = now;
+      daddy_trans_->set_property ("measurePosition", measposp.smobbed_copy ());
     }
   
   measposp += dt;
@@ -175,7 +158,8 @@ Timing_translator::start_translation_timestep ()
       b ++;
     }
 
-  daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b));
-  daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ());
+  daddy_trans_->set_property ("currentBarNumber", gh_int2scm (b));
+  daddy_trans_->set_property ("measurePosition", measposp.smobbed_copy ());
 }
 
+ENTER_DESCRIPTION(Timing_translator,"","","","","","");