X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=b69a614ea046223aeccc86d24bc6123e0779e580;hb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;hp=c7e4e0303230c1de699b988f95b063e904b182a4;hpb=c330618390bab7301500f0462e299ba8115ab0bf;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index c7e4e03032..b69a614ea0 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,134 +1,219 @@ - /* timing-translator.cc -- implement Timing_translator + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2000 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,4),4); // ugh -} +/* + TODO: change the rest of lily, so communication with + Timing_translator is only done through properties. This means the + class declaration can go here. */ bool -Timing_translator::do_try_request(Request*r) +Timing_translator::do_try_music (Music*r) { - Command_req * c = r->command(); - if (!(c && c->timing())) - return false; - for (int i=0; i < timing_req_l_arr_.size (); i++) + if (Timing_req *t = dynamic_cast (r)) { - if (timing_req_l_arr_[i]->equal_b(r)) - return true; - if (timing_req_l_arr_[i]->name() == r->name()) + for (int i=0; i < timing_req_l_arr_.size (); i++) { - r->warning (_("conflicting timing request")); - return false; + /* + merge timing reqs. + */ + if (timing_req_l_arr_[i]->equal_b(t)) + return true; + if (String (classname (timing_req_l_arr_[i])) == classname (r)) + { + r->origin ()->warning (_ ("conflicting timing request")); + timing_req_l_arr_[i]->origin ()->warning (_("This is the other timing request")); + return false; + } } - } - timing_req_l_arr_.push(c->timing()); - return true; -} - -Meter_change_req* -Timing_translator::meter_req_l() const -{ - 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(); + /* + We have to do this soon enough. Maybe we'd better disguise + \time as a \property. Then all settings will be `immediate'. + */ + if (Time_signature_change_req *c + = dynamic_cast (t)) + set_time_signature (c->beats_i_, c->one_beat_i_); + + timing_req_l_arr_.push(t); + return true; } - return m_l; + return false; } void -Timing_translator::do_process_requests() +Timing_translator::do_process_music() { 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) + if (!dynamic_cast (timing_req_l_arr_[i])) + continue; + if (measure_position ()) { - 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")); - - time_.whole_in_measure_ = 0; // resync - time_.error_b_ = true; - } - - } - else if (tr_l->cadenza()) - { - time_.set_cadenza (tr_l->cadenza()->on_b_); - - } - else if (tr_l->measuregrouping()) - { - default_grouping_ = - parse_grouping (tr_l->measuregrouping()->beat_i_arr_, - tr_l->measuregrouping()->elt_length_arr_); + timing_req_l_arr_[i]->origin ()->warning (_f ("barcheck failed at: %s", + measure_position ().str ())); + Moment zero; + // resync + daddy_trans_l_->set_property("measurePosition", zero.make_scm ()); } } } - 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. + Translator *t = this; + Global_translator *global_l =0; + do + { + t = t->daddy_trans_l_ ; + global_l = dynamic_cast (t); + } + while (!global_l); - if (!time_.cadenza_b_) - global_l->add_moment_to_process (time_.next_bar_moment ()); + /* 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) + { + Moment barleft = (measure_length () - measure_position ()); + + if (barleft > Moment (0)) + global_l->add_moment_to_process (now_mom () + barleft); + } } -IMPLEMENT_IS_TYPE_B1(Timing_translator, Translator); + ADD_THIS_TRANSLATOR(Timing_translator); void Timing_translator::do_creation_processing() { - time_.when_ = now_moment (); + Moment m; + daddy_trans_l_->set_property ("timing" , SCM_BOOL_T); + daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1)); + daddy_trans_l_->set_property ("measurePosition", m.make_scm ()); + daddy_trans_l_->set_property ("beatLength", Moment (1,4).make_scm ()); + daddy_trans_l_->set_property ("measureLength", Moment (1).make_scm()); + daddy_trans_l_->set_property ("timeSignatureFraction", + gh_cons (gh_int2scm (4), gh_int2scm (4))); +} + +Moment +Timing_translator::measure_length () const +{ + SCM l = get_property("measureLength"); + if (unsmob_moment(l)) + return *unsmob_moment (l); + else + return Moment (1); +} + + +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", len.make_scm ()); + daddy_trans_l_->set_property ("beatLength", one_beat.make_scm ()); + daddy_trans_l_->set_property ("timeSignatureFraction", + gh_cons (gh_int2scm (l), gh_int2scm (o))); +} + +Timing_translator::Timing_translator() +{ +} + + +Moment +Timing_translator::measure_position () const +{ + SCM sm = get_property ("measurePosition"); + + Moment m =0; + if (unsmob_moment (sm)) + { + m = *unsmob_moment(sm); + while (m < Moment (0)) + m += measure_length (); + } + + return m; } void Timing_translator::do_post_move_processing() { - time_.add (now_moment () - time_.when_); + 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; + + SCM s = get_property ("measurePosition"); + if (unsmob_moment (s)) + { + measposp = *unsmob_moment(s); + } + else + { + daddy_trans_l_->set_property ("measurePosition", measposp.make_scm()); + } + + 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 ); + + Moment len = measure_length (); + while (c && measposp >= len) + { + measposp -= len; + b ++; + } + + daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b)); + daddy_trans_l_->set_property ("measurePosition", measposp.make_scm()); } +