X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=f92b598a41e116ef834ed607bfedc96b8b39f088;hb=4cb2a5267e16d233b13089ab37a467c3d19da235;hp=c282d0c6088180a5274a381881bfcea28dda79bf;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index c282d0c608..f92b598a41 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,135 +1,155 @@ - /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include "debug.hh" #include "timing-translator.hh" #include "command-request.hh" #include "translator-group.hh" #include "global-translator.hh" +#include "multi-measure-rest.hh" -Timing_translator::Timing_translator() -{ - default_grouping_ = Rhythmic_grouping (MInterval (0,4),4); // ugh -} -bool -Timing_translator::do_try_request(Request*r) +void +Timing_translator::stop_translation_timestep () { - Command_req * c = r->command(); - if (!(c && c->timing())) - return false; - for (int i=0; i < timing_req_l_arr_.size (); i++) + Translator *t = this; + Global_translator *global_l =0; + do { - if (timing_req_l_arr_[i]->equal_b(r)) - return true; - if (timing_req_l_arr_[i]->name() == r->name()) - { - r->warning ("conflicting timing request"); - return false; - } + t = t->daddy_trans_l_ ; + global_l = dynamic_cast (t); } - - timing_req_l_arr_.push(c->timing()); - return true; -} + while (!global_l); -Meter_change_req* -Timing_translator::meter_req_l() const -{ - Meter_change_req *m_l=0; - for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++) + /* allbars == ! skipbars */ + 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"); + bool timb = to_boolean (tim); + if (timb && allbars) { - m_l=timing_req_l_arr_[i]->meterchange(); + Moment barleft = (measure_length () - measure_position ()); + 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); } - return m_l; } void -Timing_translator::do_process_requests() +Timing_translator::initialize () { - for (int i=0; i < timing_req_l_arr_.size (); i++) - { - Timing_req * tr_l = timing_req_l_arr_[i]; - Meter_change_req *m_l = tr_l->meterchange(); - if (m_l) - { - int b_i= m_l->beats_i_; - int o_i = m_l->one_beat_i_; - if (! time_.allow_meter_change_b()) - tr_l->warning ("Meter change not allowed here"); - else - { - time_.set_meter (b_i, o_i); - default_grouping_ = - Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_i); - } - } - else if (tr_l->partial()) - { - Moment m = tr_l->partial()->duration_; - String error = time_.try_set_partial_str (m); - if (error) - { - tr_l->warning (error); - } - else - time_.setpartial (m); - } - else if (tr_l->barcheck()) - { - if (time_.whole_in_measure_) - { - tr_l ->warning ("Barcheck failed"); - - time_.whole_in_measure_ = 0; // resync - time_.error_b_ = true; - } - - } - else if (tr_l->cadenza()) - { - time_.set_cadenza (tr_l->cadenza()->on_b_); - - } - else if (tr_l->measuregrouping()) - { - default_grouping_ = - parse_grouping (tr_l->measuregrouping()->beat_i_arr_, - tr_l->measuregrouping()->elt_length_arr_); - - } - } + daddy_trans_l_->set_property ("timing" , SCM_BOOL_T); + daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (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 ()); } - -void -Timing_translator::do_pre_move_processing() +Rational +Timing_translator::measure_length () const { - timing_req_l_arr_.set_size (0); - Global_translator *global_l = - daddy_trans_l_->ancestor_l (100)->global_l (); // ugh 100. - - if (!time_.cadenza_b_) - global_l->add_moment_to_process (time_.next_bar_moment ()); + SCM l = get_property ("measureLength"); + if (unsmob_moment (l)) + return unsmob_moment (l)->main_part_; + else + return Rational (1); } -IMPLEMENT_IS_TYPE_B1(Timing_translator, Translator); -ADD_THIS_TRANSLATOR(Timing_translator); +Timing_translator::Timing_translator () +{ -void -Timing_translator::do_creation_processing() +} + +Moment +Timing_translator::measure_position () const { - time_.when_ = now_moment (); + SCM sm = get_property ("measurePosition"); + + Moment m =0; + if (unsmob_moment (sm)) + { + 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 () { - time_.add (now_moment () - time_.when_); + Translator *t = this; + Global_translator *global_l =0; + do + { + t = t->daddy_trans_l_ ; + global_l = dynamic_cast (t); + } + while (!global_l); + + 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.to_bool ()) + return; + + Moment measposp; + + SCM s = get_property ("measurePosition"); + if (unsmob_moment (s)) + { + measposp = *unsmob_moment (s); + } + else + { + 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)) + { + b = gh_scm2int (barn); + } + + SCM cad = get_property ("timing"); + bool c= to_boolean (cad); + + 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, "","","","","" );