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)
{
{
for (int i=0; i < timing_req_l_arr_.size (); i++)
{
+ /*
+ merge timing reqs.
+ */
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"));
+ r->origin ()->warning (_ ("conflicting timing request"));
+ timing_req_l_arr_[i]->origin ()->warning (_("This is the other timing request"));
return false;
}
}
+
+ /*
+ We have to do this soon enough. Maybe we'd better disguise
+ \time as a \property. Then all settings will be `immediate'.
+ */
+ if (Time_signature_change_req *c
+ = dynamic_cast <Time_signature_change_req *> (t))
+ set_time_signature (c->beats_i_, c->one_beat_i_);
timing_req_l_arr_.push(t);
return true;
return false;
}
-/*ugh.
- */
-Time_signature_change_req*
-Timing_translator::time_signature_req_l() const
-{
- Time_signature_change_req *m_l=0;
- for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++)
- {
- m_l=dynamic_cast<Time_signature_change_req*> (timing_req_l_arr_[i]);
- }
- return m_l;
-}
-
void
-Timing_translator::do_process_requests()
+Timing_translator::do_process_music()
{
for (int i=0; i < timing_req_l_arr_.size (); i++)
{
- 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 (!dynamic_cast <Barcheck_req *> (timing_req_l_arr_[i]))
+ continue;
+ if (measure_position ())
{
- 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 ());
+ timing_req_l_arr_[i]->origin ()->warning (_f ("barcheck failed at: %s",
+ measure_position ().str ()));
+ Moment zero;
-
- }
+ // resync
+ daddy_trans_l_->set_property("measurePosition", zero.make_scm ());
}
}
-
-
}
-
void
Timing_translator::do_pre_move_processing()
{
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);
- bool timb = gh_boolean_p (tim) && gh_scm2bool ( tim);
-
-
+ 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("measureLength",
- (new Moment (1))->smobify_self());
-
+ daddy_trans_l_->set_property ("measurePosition", m.make_scm ());
+ daddy_trans_l_->set_property ("beatLength", Moment (1,4).make_scm ());
+ daddy_trans_l_->set_property ("measureLength", Moment (1).make_scm());
+ daddy_trans_l_->set_property ("timeSignatureFraction",
+ gh_cons (gh_int2scm (4), gh_int2scm (4)));
}
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
-{
- *n = measure_length () / one_beat_;
- *d = one_beat_.den_i ();
-}
-
-
void
Timing_translator::set_time_signature (int l, int o)
{
- one_beat_ = Moment (1)/Moment (o);
- Moment len = Moment (l) * one_beat_;
- daddy_trans_l_->set_property ("measureLength",
- (new Moment (len))->smobify_self ());
+ Moment one_beat = Moment (1)/Moment (o);
+ Moment len = Moment (l) * one_beat;
+ daddy_trans_l_->set_property ("measureLength", len.make_scm ());
+ daddy_trans_l_->set_property ("beatLength", one_beat.make_scm ());
+ daddy_trans_l_->set_property ("timeSignatureFraction",
+ gh_cons (gh_int2scm (l), gh_int2scm (o)));
}
Timing_translator::Timing_translator()
{
- one_beat_ = Moment( 1,4);
}
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 ();
}
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.make_scm());
}
- *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);
- bool c= gh_boolean_p (cad ) && gh_scm2bool (cad);
+ 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.make_scm());
}
-
-
-int
-Timing_translator::bars_i () const
-{
- return gh_scm2int (get_property ("currentBarNumber", 0));
-}
projects / lilypond.git / blobdiff