X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=3c445645d0e766e84e38b63c3bf3671b8757d487;hb=7e8a92a7c94146cd5879cde33b680af0e778777f;hp=8caa3eef77f48c180f9069ff1d368e16d7884db4;hpb=7d2ec0f1c47d211f243cf5646b35ef5298d8c82a;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 8caa3eef77..3c445645d0 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -4,238 +4,156 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "debug.hh" #include "timing-translator.hh" -#include "command-request.hh" + +#include "warn.hh" #include "translator-group.hh" -#include "global-translator.hh" +#include "global-context.hh" #include "multi-measure-rest.hh" -bool -Timing_translator::do_try_music (Music*r) -{ - if (Timing_req *t = dynamic_cast (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); - 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 (timing_req_l_arr_[i]); - } - return m_l; -} - void -Timing_translator::do_process_requests() +Timing_translator::stop_translation_timestep () { - 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 (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 (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 ()); - - } - } - } -} - - -void -Timing_translator::do_pre_move_processing() -{ - timing_req_l_arr_.set_size (0); - Translator *t = this; - Global_translator *global_l =0; - do - { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); - } - while (!global_l); + Global_context *global = get_global_context (); /* 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); + 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::do_creation_processing() +Timing_translator::initialize () { - 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()); + + /* + move this to engraver-init.ly? + */ + context ()->add_alias (ly_symbol2scm ("Timing")); + context ()->set_property ("timing" , SCM_BOOL_T); + context ()->set_property ("currentBarNumber" , scm_int2num (1)); + + context ()->set_property ("timeSignatureFraction", + scm_cons (scm_int2num (4), scm_int2num (4))); + /* + Do not init measurePosition; this should be done from global + context. + */ + context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ()); + context ()->set_property ("beatLength", Moment (Rational (1,4)).smobbed_copy ()); } -Moment +Rational 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)->main_part_; else - return Moment (1); + return Rational (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::Timing_translator () { - 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 ()); -} -Timing_translator::Timing_translator() -{ } - 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)) + Moment m = 0; + if (unsmob_moment (sm)) { - m = *SMOB_TO_TYPE (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 () { - Translator *t = this; - Global_translator *global_l =0; - do - { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); - } - while (!global_l); + Global_context *global = get_global_context (); - Moment dt = global_l->now_mom_ - global_l -> prev_mom_; + Moment now = global->now_mom (); + Moment dt = now - global->previous_moment (); 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) + if (!dt.to_bool ()) 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 ()); + measposp = now; + context ()->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)) + if (scm_is_number (barn)) { - b = gh_scm2int (barn); + b = scm_to_int (barn); } - SCM cad = get_property ("timing", 0); - bool c= to_boolean (cad ); + SCM cad = get_property ("timing"); + bool c = to_boolean (cad); - Moment len = measure_length (); - while (c && *measposp >= len) - { - *measposp -= len; - b ++; - } + Rational len = measure_length (); + while (c && measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + b ++; + } - tr->set_property ("currentBarNumber", gh_int2scm (b)); + context ()->set_property ("currentBarNumber", scm_int2num (b)); + context ()->set_property ("measurePosition", measposp.smobbed_copy ()); } +ADD_TRANSLATOR (Timing_translator, + "This engraver adds the alias " + "@code{Timing} to its containing context." + , + + "","","","","");