X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=f92b598a41e116ef834ed607bfedc96b8b39f088;hb=f05cfd7757b31723fe6af2f5c0e2fdbaebea3b85;hp=74efa874af0df6255f9fea7bb21fe07f4c2dd6fa;hpb=b542997680bb2d95c3a03a77468b67e04d30685f;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 74efa874af..f92b598a41 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" @@ -14,83 +14,10 @@ #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 (Timing_req *t = dynamic_cast (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")); - timing_req_l_arr_[i]->warning (_("This is the other 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_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 (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", - smobify (new Moment)); - - } - } - } -} - void -Timing_translator::do_pre_move_processing() +Timing_translator::stop_translation_timestep () { - timing_req_l_arr_.set_size (0); Translator *t = this; Global_translator *global_l =0; do @@ -110,80 +37,64 @@ Timing_translator::do_pre_move_processing() if (timb && allbars) { Moment barleft = (measure_length () - measure_position ()); + Moment now = now_mom (); - if (barleft > Moment (0)) - global_l->add_moment_to_process (now_mom () + barleft); + 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 () { daddy_trans_l_->set_property ("timing" , SCM_BOOL_T); daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1)); - daddy_trans_l_->set_property ("measurePosition", smobify (new Moment)); - daddy_trans_l_->set_property ("oneBeat", smobify (new Moment (1,4))); - daddy_trans_l_->set_property ("measureLength", smobify (new Moment (1))); + + daddy_trans_l_->set_property ("timeSignatureFraction", + gh_cons (gh_int2scm (4), gh_int2scm (4))); + 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 (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 +Timing_translator::Timing_translator () { - Moment one_beat (1,4); - SCM one = get_property ("beatLength"); - 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) -{ - Moment one_beat = Moment (1)/Moment (o); - Moment len = Moment (l) * one_beat; - daddy_trans_l_->set_property ("measureLength", smobify (new Moment (len))); - daddy_trans_l_->set_property ("beatLength", smobify (new Moment (one_beat))); } -Timing_translator::Timing_translator() -{ -} - - Moment Timing_translator::measure_position () const { 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); - 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; @@ -194,49 +105,51 @@ Timing_translator::do_post_move_processing() } 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 =0; + Moment measposp; SCM s = get_property ("measurePosition"); - if (SMOB_IS_TYPE_B (Moment, s)) + if (unsmob_moment (s)) { - measposp = SMOB_TO_TYPE (Moment,s); + measposp = *unsmob_moment (s); } else { - measposp = new Moment; - daddy_trans_l_->set_property ("measurePosition", smobify (measposp)); + measposp = now; + daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ()); } - *measposp += dt; - // don't need to set_property + 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) - { - *measposp -= len; - b ++; - } + Rational len = measure_length (); + while (c && measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + b ++; + } daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b)); + daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ()); } +ENTER_DESCRIPTION (Timing_translator, "","","","","" );