source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 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)
+Timing_translator::try_music (Music*r)
{
- if (Timing_req *t = dynamic_cast <Timing_req *> (r))
+ if (dynamic_cast<Barcheck_req*> (r))
{
- for (int i=0; i < timing_req_l_arr_.size (); i++)
- {
- if (timing_req_l_arr_[i]->equal_b(t))
- return true;
- if (String (classname (timing_req_l_arr_[i])) == classname (r))
- {
- r->warning (_ ("conflicting timing request"));
- return false;
- }
- }
-
- timing_req_l_arr_.push(t);
+ check_ = r;
return true;
}
return false;
}
-/*ugh.
- */
-Time_signature_change_req*
-Timing_translator::time_signature_req_l() const
+void
+Timing_translator::deprecated_process_music()
{
- Time_signature_change_req *m_l=0;
- for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++)
+ if (check_ && measure_position ())
{
- m_l=dynamic_cast<Time_signature_change_req*> (timing_req_l_arr_[i]);
+ 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 ());
}
- return m_l;
-}
-void
-Timing_translator::do_process_requests()
-{
- for (int i=0; i < timing_req_l_arr_.size (); i++)
+ SCM fr = get_property ("timeSignatureFraction");
+
+ if (scm_equal_p (fr, last_time_sig_) == SCM_BOOL_F)
{
- Timing_req * tr_l = timing_req_l_arr_[i];
-
- if (Time_signature_change_req *m_l = dynamic_cast <Time_signature_change_req *> (tr_l))
- {
- int b_i= m_l->beats_i_;
- int o_i = m_l->one_beat_i_;
- set_time_signature (b_i, o_i);
- }
- else if (dynamic_cast <Barcheck_req *> (tr_l))
- {
- if (measure_position ())
- {
- tr_l ->warning (_f ("barcheck failed at: %s",
- measure_position ().str ()));
- // resync
- daddy_trans_l_->set_property("measurePosition",
- (new Moment)->smobify_self ());
-
- }
- }
+ last_time_sig_ = fr;
+ set_time_signature ();
}
}
void
-Timing_translator::do_pre_move_processing()
+Timing_translator::stop_translation_timestep()
{
- timing_req_l_arr_.set_size (0);
+ check_ = 0;
+
Translator *t = this;
Global_translator *global_l =0;
do
while (!global_l);
/* allbars == ! skipbars */
- SCM sb = get_property ("skipBars", 0);
- bool allbars = !(gh_boolean_p (sb)&&gh_scm2bool (sb));
+ SCM sb = get_property ("skipBars");
+ bool allbars = !to_boolean (sb);
// urg: multi bar rests: should always process whole of first bar?
- SCM tim = get_property ("timing", 0);
+ SCM tim = get_property ("timing");
bool timb = to_boolean (tim);
if (timb && allbars)
{
Moment barleft = (measure_length () - measure_position ());
- if (barleft < Moment (0))
- barleft = 0;
-
- global_l->add_moment_to_process (now_mom () + barleft);
+ if (barleft > Moment (0))
+ global_l->add_moment_to_process (now_mom () + barleft);
}
}
void
Timing_translator::do_creation_processing()
{
+ 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",
- (new Moment)->smobify_self());
- daddy_trans_l_->set_property ("oneBeat",
- (new Moment (1,4))->smobify_self ());
- daddy_trans_l_->set_property("measureLength",
- (new Moment (1))->smobify_self());
+ 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 ();
}
Moment
Timing_translator::measure_length () const
{
- SCM l = get_property("measureLength",0);
- if (SMOB_IS_TYPE_B(Moment, l))
- return *SMOB_TO_TYPE (Moment, l);
+ SCM l = get_property("measureLength");
+ if (unsmob_moment(l))
+ return *unsmob_moment (l);
else
return Moment (1);
}
void
-Timing_translator::get_time_signature (int *n, int *d) const
-{
- Moment one_beat (1,4);
- SCM one = get_property ("beatLength",0);
- if (SMOB_IS_TYPE_B (Moment, one))
- one_beat = *SMOB_TO_TYPE (Moment, one);
- *n = measure_length () / one_beat;
- *d = one_beat.den_i ();
-}
-
-
-void
-Timing_translator::set_time_signature (int l, int o)
+Timing_translator::set_time_signature ()
{
+ 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",
- (new Moment (len))->smobify_self ());
- daddy_trans_l_->set_property ("beatength",
- (new Moment (one_beat))->smobify_self ());
+
+ 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
{
- SCM sm = get_property ("measurePosition",0);
+ SCM sm = get_property ("measurePosition");
Moment m =0;
- if (SMOB_IS_TYPE_B (Moment, sm))
+ if (unsmob_moment (sm))
{
- m = *SMOB_TO_TYPE (Moment, sm);
+ m = *unsmob_moment(sm);
while (m < Moment (0))
m += measure_length ();
}
}
void
-Timing_translator::do_post_move_processing()
+Timing_translator::start_translation_timestep()
{
+ check_ =00;
Translator *t = this;
Global_translator *global_l =0;
do
if (!dt)
return;
- Moment * measposp =0;
+ Moment measposp;
- SCM s = get_property ("measurePosition", 0);
- if (SMOB_IS_TYPE_B (Moment, s))
+ SCM s = get_property ("measurePosition");
+ if (unsmob_moment (s))
{
- measposp = SMOB_TO_TYPE (Moment,s);
+ measposp = *unsmob_moment(s);
}
else
{
- measposp = new Moment;
- daddy_trans_l_->set_property ("measurePosition", measposp->smobify_self ());
+ daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy());
}
- *measposp += dt;
- // don't need to set_property
+ measposp += dt;
- Translator_group * tr =daddy_trans_l_;
- SCM barn = get_property ("currentBarNumber", &tr);
+ SCM barn = get_property ("currentBarNumber");
int b = 0;
if (gh_number_p(barn))
{
b = gh_scm2int (barn);
}
- SCM cad = get_property ("timing", 0);
+ SCM cad = get_property ("timing");
bool c= to_boolean (cad );
Moment len = measure_length ();
- while (c && *measposp >= len)
- {
- *measposp -= len;
- b ++;
- }
+ while (c && measposp >= len)
+ {
+ measposp -= len;
+ b ++;
+ }
- tr->set_property ("currentBarNumber", gh_int2scm (b));
+ daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b));
+ daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy());
}