X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=3879f6963481b9da1206c1466b0d3abaa05c679a;hb=48f2b9351f93d0161c675cfb60e95bf919041df2;hp=fa974f7bfa2a463aadb6e13875bc8de253f19544;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index fa974f7bfa..3879f69634 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,22 +1,19 @@ /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter (c) 1997--1999 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) { @@ -63,60 +60,21 @@ Timing_translator::do_process_requests() { 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); + set_time_signature (b_i, o_i); } else if (dynamic_cast (tr_l)) { - if (time_.whole_in_measure_) + if (measure_position ()) { - tr_l ->warning (_f ("barcheck failed by: %s", - time_.whole_in_measure_.str ())); + tr_l ->warning (_f ("barcheck failed at: %s", + measure_position ().str ())); + // resync + daddy_trans_l_->set_property("measurePosition", + (new Moment)->smobify_self ()); - 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_); - - } - } - - Translator_group * tr=0; - - Scalar barn = get_property ("currentBarNumber", &tr); - if (!barn.empty_b () && barn.isnum_b ()) - { - time_.bars_i_ = int(barn); - tr->set_property ("currentBarNumber", ""); } - - } @@ -124,16 +82,29 @@ void Timing_translator::do_pre_move_processing() { timing_req_l_arr_.set_size (0); - Global_translator *global_l = - dynamic_cast (daddy_trans_l_->ancestor_l (100)); // ugh 100. - + Translator *t = this; + Global_translator *global_l =0; + do + { + t = t->daddy_trans_l_ ; + global_l = dynamic_cast (t); + } + while (!global_l); /* allbars == ! skipbars */ - bool allbars = ! get_property ("SkipBars", 0).to_bool (); + SCM sb = get_property ("skipBars", 0); + bool allbars = !(gh_boolean_p (sb)&&gh_scm2bool (sb)); + + // urg: multi bar rests: should always process whole of first bar? + SCM tim = get_property ("timing", 0); + bool timb = to_boolean (tim); + if (timb && allbars) + { + Moment barleft = (measure_length () - measure_position ()); - // 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 ()); + if (barleft > Moment (0)) + global_l->add_moment_to_process (now_mom () + barleft); + } } @@ -142,22 +113,127 @@ ADD_THIS_TRANSLATOR(Timing_translator); void Timing_translator::do_creation_processing() { - time_.when_ = now_mom (); + daddy_trans_l_->set_property ("timing" , SCM_BOOL_T); + daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1)); + daddy_trans_l_->set_property("measurePosition", + (new Moment)->smobify_self()); + daddy_trans_l_->set_property ("oneBeat", + (new Moment (1,4))->smobify_self ()); + daddy_trans_l_->set_property("measureLength", + (new Moment (1))->smobify_self()); +} + +Moment +Timing_translator::measure_length () const +{ + SCM l = get_property("measureLength",0); + if (SMOB_IS_TYPE_B(Moment, l)) + return *SMOB_TO_TYPE (Moment, l); + else + return Moment (1); } + void -Timing_translator::do_post_move_processing() +Timing_translator::get_time_signature (int *n, int *d) const { - time_.add (now_mom () - time_.when_); + Moment one_beat (1,4); + SCM one = get_property ("beatLength",0); + if (SMOB_IS_TYPE_B (Moment, one)) + one_beat = *SMOB_TO_TYPE (Moment, one); + *n = measure_length () / one_beat; + *d = one_beat.den_i (); +} +void +Timing_translator::set_time_signature (int l, int o) +{ + Moment one_beat = Moment (1)/Moment (o); + Moment len = Moment (l) * one_beat; + daddy_trans_l_->set_property ("measureLength", + (new Moment (len))->smobify_self ()); + daddy_trans_l_->set_property ("beatength", + (new Moment (one_beat))->smobify_self ()); +} + +Timing_translator::Timing_translator() +{ +} + + +Moment +Timing_translator::measure_position () const +{ + SCM sm = get_property ("measurePosition",0); + + Moment m =0; + if (SMOB_IS_TYPE_B (Moment, sm)) + { + m = *SMOB_TO_TYPE (Moment, sm); + while (m < Moment (0)) + m += measure_length (); + } + + return m; } void -Timing_translator::do_print () const +Timing_translator::do_post_move_processing() { -#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 dt = global_l->now_mom_ - global_l -> prev_mom_; + if (dt < Moment (0)) + { + programming_error ("Moving backwards in time"); + dt = 0; + } + + if (!dt) + return; + + Moment * measposp =0; + + SCM s = get_property ("measurePosition", 0); + if (SMOB_IS_TYPE_B (Moment, s)) + { + measposp = SMOB_TO_TYPE (Moment,s); + } + else + { + measposp = new Moment; + daddy_trans_l_->set_property ("measurePosition", measposp->smobify_self ()); + } + + *measposp += dt; + // don't need to set_property + + Translator_group * tr =daddy_trans_l_; + SCM barn = get_property ("currentBarNumber", &tr); + int b = 0; + if (gh_number_p(barn)) + { + b = gh_scm2int (barn); + } + + SCM cad = get_property ("timing", 0); + bool c= to_boolean (cad ); + + Moment len = measure_length (); + while (c && *measposp >= len) + { + *measposp -= len; + b ++; + } + + tr->set_property ("currentBarNumber", gh_int2scm (b)); } +