X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=f98ac23c2fc1af222789727a764559ca8c661ffa;hb=b05241299d5e20c07676430c516d3ed0d35a8e9a;hp=92db7ee737387df5646a935d5127c23f979eb289;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 92db7ee737..f98ac23c2f 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,152 +1,146 @@ /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2006 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" -bool -Timing_translator::do_try_music (Music*r) +void +Timing_translator::stop_translation_timestep () { - if (Timing_req *t = dynamic_cast (r)) + Global_context *global = get_global_context (); + + if (to_boolean (get_property ("timing")) + && !to_boolean (get_property ("skipBars"))) { - 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; + Moment barleft = (measure_length () - measure_position (context ())); + 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); } - return false; } -/*ugh. - */ -Time_signature_change_req* -Timing_translator::time_signature_req_l() const +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 ()); +} + +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 () { - 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::start_translation_timestep () { - for (int i=0; i < timing_req_l_arr_.size (); i++) + Global_context *global = get_global_context (); + + Moment now = global->now_mom (); + Moment dt = now - global->previous_moment (); + if (dt < Moment (0)) { - 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_; - if (! time_.allow_time_signature_change_b()) - tr_l->warning (_ ("time signature change not allowed here")); - else - { - time_.set_time_signature (b_i, o_i); - } - } - else if (Partial_measure_req *pm = dynamic_cast (tr_l)) - { - Moment m = pm->length_mom_; - String error = time_.try_set_partial_str (m); - if (error.length_i ()) - { - tr_l->warning (error); - } - else - time_.setpartial (m); - } - else if (dynamic_cast (tr_l)) - { - if (time_.whole_in_measure_) - { - tr_l ->warning (_f ("barcheck failed at: %s", - time_.whole_in_measure_.str ())); - - time_.whole_in_measure_ = 0; // resync - } - } - else if (Cadenza_req *cr = dynamic_cast (tr_l)) - { - time_.set_cadenza (cr->on_b_); - } + programming_error ("moving backwards in time"); + dt = 0; } - - Translator_group * tr=0; - - Scalar barn = get_property ("currentBarNumber", &tr); - if (!barn.empty_b () && barn.isnum_b ()) + else if (dt.main_part_.is_infinity ()) { - time_.bars_i_ = int(barn); - tr->set_property ("currentBarNumber", ""); + programming_error ("moving infinitely to future"); + dt = 0; } - -} + if (!dt.to_bool ()) + return; + Moment measposp; -void -Timing_translator::do_pre_move_processing() -{ - timing_req_l_arr_.set_size (0); - Translator *t = this; - Global_translator *global_l =0; - do + SCM s = get_property ("measurePosition"); + if (unsmob_moment (s)) + measposp = *unsmob_moment (s); + else { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); + measposp = now; + context ()->set_property ("measurePosition", + measposp.smobbed_copy ()); } - while (!global_l); - /* allbars == ! skipbars */ - bool allbars = ! get_property ("skipBars", 0).to_bool (); + measposp += dt; - // urg: multi bar rests: should always process whole of first bar? - if (!time_.cadenza_b_ && allbars) - global_l->add_moment_to_process (time_.next_bar_moment ()); -} + int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0); + int internal_barnumber = robust_scm2int (get_property ("internalBarNumber"), 0); + SCM cad = get_property ("timing"); + bool c = to_boolean (cad); -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_mom (); + 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_mom () - time_.when_); +#include "translator.icc" +ADD_TRANSLATOR (Timing_translator, + "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}. " + "\n\nThis engraver adds the alias @code{Timing} to its containing context.", -} + "", -void -Timing_translator::do_print () const -{ -#ifndef NPRINT - time_.print (); -#endif -} + "internalBarNumber " + "currentBarNumber " + "measureLength " + "measurePosition ", + + "internalBarNumber " + "currentBarNumber " + "measurePosition " + );