X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=749aa18e47b3e80d5ea0aa16384f72e69130a76c;hb=79d5be4a62e43ea14042cba8787a589fc9f3340b;hp=44a61739f37a8320346af15fd6966265b4b7b99d;hpb=fd35c1854983063501a1152c3827530e866dcde3;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 44a61739f3..749aa18e47 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,134 +1,147 @@ - /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #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" -Timing_translator::Timing_translator() +void +Timing_translator::stop_translation_timestep () { - default_grouping_ = Rhythmic_grouping (MInterval (0,4),4); // ugh -} + Global_context *global = get_global_context (); -bool -Timing_translator::do_try_request(Request*r) -{ - Command_req * c = r->command(); - if (!(c && c->timing())) - return false; - for (int i=0; i < timing_req_l_arr_.size (); i++) + if (to_boolean (get_property ("timing")) + && !to_boolean (get_property ("skipBars"))) { - if (timing_req_l_arr_[i]->equal_b(r)) - return true; - if (timing_req_l_arr_[i]->name() == r->name()) + Moment barleft = (measure_length () - measure_position (context ())); + Moment now = now_mom (); + + if (barleft > Moment (0)) { - r->warning (_("conflicting timing request")); - return false; + Moment nextmom = now + barleft; + nextmom.grace_part_ = Rational (0); + global->add_moment_to_process (nextmom); } } +} - timing_req_l_arr_.push(c->timing()); - return true; +void +Timing_translator::initialize () +{ + context ()->add_alias (ly_symbol2scm ("Timing")); + context ()->set_property ("currentBarNumber", scm_from_int (1)); + context ()->set_property ("internalBarNumber", scm_from_int (1)); + + context ()->set_property ("timeSignatureFraction", + scm_cons (scm_from_int (4), scm_from_int (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 ()); } -Meter_change_req* -Timing_translator::meter_req_l() const +Rational +Timing_translator::measure_length () const +{ + SCM l = get_property ("measureLength"); + if (unsmob_moment (l)) + return unsmob_moment (l)->main_part_; + else + return Rational (1); +} + +Timing_translator::Timing_translator () { - Meter_change_req *m_l=0; - for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++) - { - m_l=timing_req_l_arr_[i]->meterchange(); - } - return m_l; } void -Timing_translator::do_process_requests() +Timing_translator::start_translation_timestep () { - 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.length_i ()) - { - tr_l->warning (error); - } - else - time_.setpartial (m); - } - else if (tr_l->barcheck()) - { - if (time_.whole_in_measure_) - { - tr_l ->warning (_("Barcheck failed")); + Global_context *global = get_global_context (); - time_.whole_in_measure_ = 0; // resync - time_.error_b_ = true; - } + 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; + } - } - else if (tr_l->cadenza()) - { - time_.set_cadenza (tr_l->cadenza()->on_b_); + if (!dt.to_bool ()) + return; - } - else if (tr_l->measuregrouping()) - { - default_grouping_ = - parse_grouping (tr_l->measuregrouping()->beat_i_arr_, - tr_l->measuregrouping()->elt_length_arr_); + Moment measposp; - } + SCM s = get_property ("measurePosition"); + if (unsmob_moment (s)) + measposp = *unsmob_moment (s); + else + { + measposp = now; + context ()->set_property ("measurePosition", + measposp.smobbed_copy ()); } -} + measposp += dt; -void -Timing_translator::do_pre_move_processing() -{ - timing_req_l_arr_.set_size (0); - Global_translator *global_l = - daddy_trans_l_->ancestor_l (100)->global_l (); // ugh 100. + int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0); + int internal_barnumber = robust_scm2int (get_property ("internalBarNumber"), 0); - if (!time_.cadenza_b_) - global_l->add_moment_to_process (time_.next_bar_moment ()); -} + SCM cad = get_property ("timing"); + bool c = to_boolean (cad); -IMPLEMENT_IS_TYPE_B1(Timing_translator, Translator); -ADD_THIS_TRANSLATOR(Timing_translator); + Rational len = measure_length (); + while (c && measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + current_barnumber ++; + internal_barnumber ++; + } -void -Timing_translator::do_creation_processing() -{ - time_.when_ = now_moment (); + context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber)); + context ()->set_property ("internalBarNumber", scm_from_int (internal_barnumber)); + context ()->set_property ("measurePosition", measposp.smobbed_copy ()); } -void -Timing_translator::do_post_move_processing() -{ - time_.add (now_moment () - time_.when_); -} +#include "translator.icc" + +ADD_TRANSLATOR (Timing_translator, + /* doc */ + "This engraver adds the alias @code{Timing} to its containing" + " context. Responsible for synchronizing timing information" + " from staves. Normally in @code{Score}. In order to create" + " polyrhythmic music, this engraver should be removed from" + " @code{Score} and placed in @code{Staff}.", + + /* create */ + "", + + /* read */ + "internalBarNumber " + "currentBarNumber " + "measureLength " + "measurePosition ", + + /* write */ + "internalBarNumber " + "currentBarNumber " + "measurePosition " + );