X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=8158bb18311b85d5453ece019cfed9d6c06e0336;hb=38d60c0c4e8c29beccd4acfd07aadf1cdea74097;hp=534d3f2f31e3503cb6e4000fac8db618b93c5318;hpb=843f36c1b3100c3d21f1be471537b93c4f8eabae;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 534d3f2f31..8158bb1831 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,151 +1,157 @@ /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2001 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, 1), 4); // ugh -} -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++) - { - 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; - } - return false; -} -/*ugh. - */ -Time_signature_change_req* -Timing_translator::time_signature_req_l() const +void +Timing_translator::stop_translation_timestep () { - Time_signature_change_req *m_l=0; - for (int i=0; !m_l && i < timing_req_l_arr_.size (); i++) + + Translator *t = this; + Global_translator *global_l =0; + do { - m_l=dynamic_cast (timing_req_l_arr_[i]); + t = t->daddy_trans_l_ ; + global_l = dynamic_cast (t); } - return m_l; -} + while (!global_l); -void -Timing_translator::do_process_requests() -{ - for (int i=0; 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) { - 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->duration_; - 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_); - - } + 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); } } void -Timing_translator::do_pre_move_processing() +Timing_translator::initialize () { - timing_req_l_arr_.set_size (0); - Global_translator *global_l = - dynamic_cast (daddy_trans_l_->ancestor_l (100)); // ugh 100. - - - /* allbars == ! skipbars */ - bool allbars = ! get_property ("SkipBars", 0).to_bool (); - - // 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 ()); + 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 ()); } +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); +} -ADD_THIS_TRANSLATOR(Timing_translator); - -void -Timing_translator::do_creation_processing() +Timing_translator::Timing_translator () { - time_.when_ = now_moment (); + } -void -Timing_translator::do_post_move_processing() +Moment +Timing_translator::measure_position () const { - time_.add (now_moment () - time_.when_); + 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_print () const +Timing_translator::start_translation_timestep () { -#ifndef NPRINT - time_.print (); - default_grouping_.print (); -#endif + 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 ()); } +