source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 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::do_try_music (Music*r)
-{
- if (dynamic_cast<Barcheck_req*> (r))
- {
- check_ = r;
- return true;
- }
- return false;
-}
-
-void
-Timing_translator::deprecated_process_music()
-{
- if (check_ && measure_position ())
- {
- 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 ());
- }
-
- SCM fr = get_property ("timeSignatureFraction");
-
- if (scm_equal_p (fr, last_time_sig_) == SCM_BOOL_F)
- {
- last_time_sig_ = fr;
- set_time_signature ();
- }
-}
void
-Timing_translator::do_pre_move_processing()
+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::do_creation_processing()
+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)));
-
- set_time_signature ();
+ 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 ());
}
-Moment
+Rational
Timing_translator::measure_length () const
{
- SCM l = get_property("measureLength");
- if (unsmob_moment(l))
- return *unsmob_moment (l);
+ SCM l = get_property ("measureLength");
+ if (unsmob_moment (l))
+ return unsmob_moment (l)->main_part_;
else
- return Moment (1);
+ return Rational (1);
}
-
-void
-Timing_translator::set_time_signature ()
+Timing_translator::Timing_translator ()
{
- SCM fr = get_property ("timeSignatureFraction");
- int l = gh_scm2int (gh_car (fr));
- int o = gh_scm2int (gh_cdr (fr));
-
- Moment one_beat = Moment (1)/Moment (o);
- Moment len = Moment (l) * one_beat;
- daddy_trans_l_->set_property ("measureLength", len.smobbed_copy ());
- daddy_trans_l_->set_property ("beatLength", one_beat.smobbed_copy ());
}
-Timing_translator::Timing_translator()
-{
-
- last_time_sig_ = SCM_BOOL_F;
-
-}
-
-
Moment
Timing_translator::measure_position () const
{
Moment m =0;
if (unsmob_moment (sm))
{
- m = *unsmob_moment(sm);
- while (m < Moment (0))
- m += measure_length ();
+ m = *unsmob_moment (sm);
+ while (m.main_part_ < Rational (0))
+ m.main_part_ += measure_length ();
}
return m;
}
void
-Timing_translator::do_post_move_processing()
+Timing_translator::start_translation_timestep ()
{
- check_ =00;
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;
SCM s = get_property ("measurePosition");
if (unsmob_moment (s))
{
- measposp = *unsmob_moment(s);
+ measposp = *unsmob_moment (s);
}
else
{
- daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy());
+ measposp = now;
+ daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ());
}
measposp += dt;
SCM barn = get_property ("currentBarNumber");
int b = 0;
- if (gh_number_p(barn))
+ if (gh_number_p (barn))
{
b = gh_scm2int (barn);
}
SCM cad = get_property ("timing");
- bool c= to_boolean (cad );
+ bool c= to_boolean (cad);
- Moment len = measure_length ();
- while (c && measposp >= len)
+ Rational len = measure_length ();
+ while (c && measposp.main_part_ >= len)
{
- measposp -= len;
+ measposp.main_part_ -= len;
b ++;
}
daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b));
- daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy());
+ daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ());
}