source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.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;
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_l->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 ());
+ daddy_trans_l_->set_property ("measurePosition", Moment (Rational (0)).smobbed_copy ());
+ daddy_trans_l_->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ());
+ daddy_trans_l_->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ());
}
Rational
void
Timing_translator::start_translation_timestep ()
{
- check_ = 0;
Translator *t = this;
Global_translator *global_l =0;
do
}
while (!global_l);
- Moment dt = global_l->now_mom_ - global_l -> prev_mom_;
+ Moment now = global_l->now_mom_;
+ Moment dt = now - global_l -> prev_mom_;
if (dt < Moment (0))
{
programming_error ("Moving backwards in time");
dt = 0;
}
- if (!dt)
+ if (!dt.to_bool ())
return;
Moment measposp;
}
else
{
+ measposp = now;
daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ());
}