X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=9fde83d395c7d5c51e02e5719ea21735e12b0120;hb=55d1940131f7ce2fa26e4de1e428c6c42c3d41b9;hp=26e2f21dec54a2df7b8b6881bc02c0a7557dd6b3;hpb=3a46c107cba4b3d2dba74e21f9046cc399c8baf1;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 26e2f21dec..9fde83d395 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,150 +1,160 @@ /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ +#include "warn.hh" #include "timing-translator.hh" -#include "command-request.hh" + #include "translator-group.hh" -#include "global-translator.hh" +#include "global-context.hh" #include "multi-measure-rest.hh" -Timing_translator::Timing_translator () -{ - default_grouping_ = Rhythmic_grouping (MInterval (0, 1), 4); // ugh -} -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 (); + + /* 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) { - 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 ()); + 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 () { - 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; + + /* + 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 ()); } -void -Timing_translator::do_process_requests() +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 () { - for (int i=0; i < timing_req_l_arr_.size (); i++) + +} + +Moment +Timing_translator::measure_position () const +{ + SCM sm = get_property ("measurePosition"); + + Moment m =0; + if (unsmob_moment (sm)) { - 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); - default_grouping_ = - Rhythmic_grouping (MInterval (0,Moment (b_i, o_i)), b_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 by: %s", - time_.whole_in_measure_.str ())); - - time_.whole_in_measure_ = 0; // resync - time_.error_b_ = true; - } - } - else if (Cadenza_req *cr = dynamic_cast (tr_l)) - { - time_.set_cadenza (cr->on_b_); - } - else if (Measure_grouping_req *mg=dynamic_cast (tr_l)) - { - default_grouping_ = - parse_grouping (mg->beat_i_arr_, - mg->elt_length_arr_); - - } + m = *unsmob_moment (sm); + while (m.main_part_ < Rational (0)) + m.main_part_ += measure_length (); } + + return m; } - void -Timing_translator::do_pre_move_processing() +Timing_translator::start_translation_timestep () { - timing_req_l_arr_.set_size (0); - Global_translator *global_l = - dynamic_cast (daddy_trans_l_->ancestor_l (100)); // ugh 100. + Global_context *global =get_global_context (); + 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.to_bool ()) + return; - /* allbars == ! skipbars */ - bool allbars = ! get_property ("SkipBars", 0).to_bool (); + Moment measposp; - // urg: multi bar rests: should always must process whole of first bar? - if (!time_.cadenza_b_ && allbars) - global_l->add_moment_to_process (time_.next_bar_moment ()); -} + 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; + + SCM barn = get_property ("currentBarNumber"); + int b = 0; + if (scm_is_number (barn)) + { + b = scm_to_int (barn); + } + 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; + b ++; + } -void -Timing_translator::do_creation_processing() -{ - time_.when_ = now_mom (); + context ()->set_property ("currentBarNumber", scm_int2num (b)); + context ()->set_property ("measurePosition", measposp.smobbed_copy ()); } -void -Timing_translator::do_post_move_processing() -{ - time_.add (now_mom () - time_.when_); -} +ENTER_DESCRIPTION (Timing_translator, + "This engraver adds the alias " + "@code{Timing} to its containing context." + , -void -Timing_translator::do_print () const -{ -#ifndef NPRINT - time_.print (); - default_grouping_.print (); -#endif -} + "","","","","");