X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=4716eceb24c489d05ff30feb19a304a449f80f2f;hb=79568c57ad868fec7c1307731e84a1c2f26acaa5;hp=10bc8f196b2cced90efdec8ebf77afcda44026dc;hpb=da7dbf5f2f54bc66984ab2524c490335d567b5e7;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 10bc8f196b..4716eceb24 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,170 +1,258 @@ /* - timing-translator.cc -- implement Timing_translator + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--1999 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "timing-translator.hh" -#include "command-request.hh" + +#include "warn.hh" #include "translator-group.hh" -#include "global-translator.hh" -#include "multi-measure-rest.hh" +#include "global-context.hh" +#include "moment.hh" +#include "lily-imports.hh" -Timing_translator::Timing_translator () +void +Timing_translator::stop_translation_timestep () { - default_grouping_ = Rhythmic_grouping (MInterval (0, 1), 4); // ugh -} + Global_context *global = get_global_context (); -bool -Timing_translator::do_try_music (Music*r) -{ - if (Timing_req *t = dynamic_cast (r)) + 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)) + { + Moment nextmom = now + barleft; + nextmom.grace_part_ = Rational (0); + global->add_moment_to_process (nextmom); + } } - 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++) + Context *timing = unsmob + (Lily::ly_context_find (context ()->self_scm (), ly_symbol2scm ("Timing"))); + if (timing != context ()) { - m_l=dynamic_cast (timing_req_l_arr_[i]); + context ()->add_alias (ly_symbol2scm ("Timing")); + + if (!timing) + { + programming_error ("Can't find Timing context template"); + timing = context (); + } } - return m_l; -} -void -Timing_translator::do_process_requests() -{ - for (int i=0; i < timing_req_l_arr_.size (); i++) + SCM barnumber = timing->get_property ("currentBarNumber"); + if (!scm_is_integer (barnumber)) + barnumber = scm_from_int (1); + context ()->set_property ("currentBarNumber", barnumber); + context ()->set_property ("internalBarNumber", barnumber); + + SCM timeSignatureFraction = timing->get_property ("timeSignatureFraction"); + + if (!scm_is_pair (timeSignatureFraction)) { - 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 == 1 ? 2 : 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_); - - } + programming_error ("missing timeSignatureFraction"); + timeSignatureFraction = scm_cons (scm_from_int (4), scm_from_int (4)); } + context ()->set_property ("timeSignatureFraction", timeSignatureFraction); - Translator_group * tr=0; + SCM measureLength = timing->get_property ("measureLength"); - Scalar barn = get_property ("currentBarNumber", &tr); - if (!barn.empty_b () && barn.isnum_b ()) + if (!unsmob (measureLength)) { - time_.bars_i_ = int(barn); - tr->set_property ("currentBarNumber", ""); + measureLength = + Moment (ly_scm2rational + (scm_divide (scm_car (timeSignatureFraction), + scm_cdr (timeSignatureFraction)))).smobbed_copy (); } - + context ()->set_property ("measureLength", measureLength); -} + /* + Do not init measurePosition; this should be done from global + context. + */ + SCM timeSignatureSettings = timing->get_property ("timeSignatureSettings"); + if (!scm_is_pair (timeSignatureSettings)) + { + programming_error ("missing timeSignatureSettings"); + timeSignatureSettings = Lily::default_time_signature_settings; + } + context ()->set_property ("timeSignatureSettings", timeSignatureSettings); -void -Timing_translator::do_pre_move_processing() -{ - timing_req_l_arr_.set_size (0); - Translator *t = this; - Global_translator *global_l =0; - do + SCM beamExceptions = timing->get_property ("beamExceptions"); + if (!scm_is_pair (beamExceptions)) { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); + beamExceptions = Lily::beam_exceptions (timeSignatureFraction, + timeSignatureSettings); } - while (!global_l); + context ()->set_property ("beamExceptions", beamExceptions); - /* allbars == ! skipbars */ - bool allbars = ! get_property ("skipBars", 0).to_bool (); + SCM baseMoment = timing->get_property ("baseMoment"); + if (!unsmob (baseMoment)) + { + baseMoment = + Moment (ly_scm2rational + (Lily::base_length (timeSignatureFraction, + timeSignatureSettings))).smobbed_copy (); + } + context ()->set_property ("baseMoment", baseMoment); - // 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 ()); -} + SCM beatStructure = timing->get_property ("beatStructure"); + if (!scm_is_pair (beatStructure)) + { + beatStructure = + Lily::beat_structure (ly_rational2scm (unsmob (baseMoment)->main_part_), + timeSignatureFraction, + timeSignatureSettings); + } + context ()->set_property ("beatStructure", beatStructure); + context ()->set_property ("beamHalfMeasure", + timing->get_property ("beamHalfMeasure")); -ADD_THIS_TRANSLATOR(Timing_translator); + context ()->set_property ("autoBeaming", + timing->get_property ("autoBeaming")); +} -void -Timing_translator::do_creation_processing() +Rational +Timing_translator::measure_length () const +{ + SCM l = get_property ("measureLength"); + if (unsmob (l)) + return unsmob (l)->main_part_; + else + return Rational (1); +} + +Timing_translator::Timing_translator () { - time_.when_ = now_mom (); } void -Timing_translator::do_post_move_processing() +Timing_translator::start_translation_timestep () { - time_.add (now_mom () - time_.when_); + 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; + + Moment measposp; + + SCM s = get_property ("measurePosition"); + if (unsmob (s)) + measposp = *unsmob (s); + else + { + measposp = now; + } + + 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); + if (c) + { + Rational len = measure_length (); + + measposp += dt; + + while (measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + current_barnumber++; + internal_barnumber++; + } + } + + + // Because "timing" can be switched on and off asynchronously with + // graces, measurePosition might get into strange settings of + // grace_part_. It does not actually make sense to have it diverge + // from the main timing. Updating the grace part outside of the + // actual check for "timing" looks strange and will lead to changes + // of grace_part_ even when timing is off. However, when timing is + // switched back on again, this will generally happen in an override + // that does _not_ in itself advance current_moment. So the whole + // timing advance logic will only get triggered while "timing" is + // still of. Maybe we should keep measurePosition.grace_part_ + // constantly at zero anyway? + + measposp.grace_part_ = now.grace_part_; + + 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 ()); } +#include "translator.icc" + void -Timing_translator::do_print () const +Timing_translator::boot () { -#ifndef NPRINT - time_.print (); - default_grouping_.print (); -#endif + } + +ADD_TRANSLATOR (Timing_translator, + /* doc */ + "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}.", + + /* create */ + "", + + /* read */ + "baseMoment " + "currentBarNumber " + "internalBarNumber " + "measureLength " + "measurePosition " + "timeSignatureFraction ", + + /* write */ + "baseMoment " + "currentBarNumber " + "internalBarNumber " + "measureLength " + "measurePosition " + "timeSignatureFraction " + );