X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=4716eceb24c489d05ff30feb19a304a449f80f2f;hb=c991eb5d49a1b36c81a890c4574f75d8834bb9a0;hp=9096284795223d6b930b1088baf0d4a790d5d233;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 9096284795..4716eceb24 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,230 +1,258 @@ /* - timing-translator.cc -- implement Timing_translator + This file is part of LilyPond, the GNU music typesetter. + Copyright (C) 1997--2015 Han-Wen Nienhuys - source file of the GNU LilyPond music typesetter + 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. - (c) 1997--2000 Han-Wen Nienhuys + 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 "debug.hh" #include "timing-translator.hh" -#include "command-request.hh" -#include "translator-group.hh" -#include "global-translator.hh" -#include "multi-measure-rest.hh" -/* - TODO: change the rest of lily, so communication with - Timing_translator is only done through properties. This means the - class declaration can go here. */ +#include "warn.hh" +#include "translator-group.hh" +#include "global-context.hh" +#include "moment.hh" +#include "lily-imports.hh" -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 (); + + if (to_boolean (get_property ("timing")) + && !to_boolean (get_property ("skipBars"))) { - for (int i=0; i < timing_req_l_arr_.size (); i++) - { - /* - 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->warning (_ ("conflicting timing request")); - timing_req_l_arr_[i]->warning (_("This is the other 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_music() -{ - 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_; - set_time_signature (b_i, o_i); - } - else if (dynamic_cast (tr_l)) - { - if (measure_position ()) - { - tr_l ->warning (_f ("barcheck failed at: %s", - measure_position ().str ())); - // resync - daddy_trans_l_->set_property("measurePosition", - smobify (new Moment)); - - } - } + programming_error ("missing timeSignatureFraction"); + timeSignatureFraction = scm_cons (scm_from_int (4), scm_from_int (4)); } -} + context ()->set_property ("timeSignatureFraction", timeSignatureFraction); + SCM measureLength = timing->get_property ("measureLength"); -void -Timing_translator::do_pre_move_processing() -{ - timing_req_l_arr_.set_size (0); - Translator *t = this; - Global_translator *global_l =0; - do + if (!unsmob (measureLength)) { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); + measureLength = + Moment (ly_scm2rational + (scm_divide (scm_car (timeSignatureFraction), + scm_cdr (timeSignatureFraction)))).smobbed_copy (); } - while (!global_l); + context ()->set_property ("measureLength", measureLength); - /* allbars == ! skipbars */ - SCM sb = get_property ("skipBars"); - bool allbars = !to_boolean (sb); + /* + Do not init measurePosition; this should be done from global + context. + */ - // urg: multi bar rests: should always process whole of first bar? - SCM tim = get_property ("timing"); - bool timb = to_boolean (tim); - if (timb && allbars) + SCM timeSignatureSettings = timing->get_property ("timeSignatureSettings"); + if (!scm_is_pair (timeSignatureSettings)) { - Moment barleft = (measure_length () - measure_position ()); + programming_error ("missing timeSignatureSettings"); + timeSignatureSettings = Lily::default_time_signature_settings; + } + context ()->set_property ("timeSignatureSettings", timeSignatureSettings); - if (barleft > Moment (0)) - global_l->add_moment_to_process (now_mom () + barleft); + SCM beamExceptions = timing->get_property ("beamExceptions"); + if (!scm_is_pair (beamExceptions)) + { + beamExceptions = Lily::beam_exceptions (timeSignatureFraction, + timeSignatureSettings); } -} + context ()->set_property ("beamExceptions", beamExceptions); + + 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); + 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); -ADD_THIS_TRANSLATOR(Timing_translator); + context ()->set_property ("beamHalfMeasure", + timing->get_property ("beamHalfMeasure")); -void -Timing_translator::do_creation_processing() -{ - daddy_trans_l_->set_property ("timing" , SCM_BOOL_T); - daddy_trans_l_->set_property ("currentBarNumber" , gh_int2scm (1)); - daddy_trans_l_->set_property ("measurePosition", smobify (new Moment)); - daddy_trans_l_->set_property ("beatLength", smobify (new Moment (1,4))); - daddy_trans_l_->set_property ("measureLength", smobify (new Moment (1))); + context ()->set_property ("autoBeaming", + timing->get_property ("autoBeaming")); } -Moment +Rational Timing_translator::measure_length () const { - SCM l = get_property("measureLength"); - if (unsmob_moment(l)) - return *unsmob_moment (l); + SCM l = get_property ("measureLength"); + if (unsmob (l)) + return unsmob (l)->main_part_; else - return Moment (1); + return Rational (1); } - -void -Timing_translator::set_time_signature (int l, int o) +Timing_translator::Timing_translator () { - Moment one_beat = Moment (1)/Moment (o); - Moment len = Moment (l) * one_beat; - daddy_trans_l_->set_property ("measureLength", smobify (new Moment (len))); - daddy_trans_l_->set_property ("beatLength", smobify (new Moment (one_beat))); -} - -Timing_translator::Timing_translator() -{ -} - - -Moment -Timing_translator::measure_position () const -{ - SCM sm = get_property ("measurePosition"); - - 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_post_move_processing() +Timing_translator::start_translation_timestep () { - Translator *t = this; - Global_translator *global_l =0; - do - { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); - } - while (!global_l); + Global_context *global = get_global_context (); - Moment dt = global_l->now_mom_ - global_l -> prev_mom_; + Moment now = global->now_mom (); + Moment dt = now - global->previous_moment (); if (dt < Moment (0)) { - programming_error ("Moving backwards in time"); + 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) + + if (!dt.to_bool ()) return; - Moment * measposp =0; + Moment measposp; SCM s = get_property ("measurePosition"); - if (SMOB_IS_TYPE_B (Moment, s)) - { - measposp = SMOB_TO_TYPE (Moment,s); - } + if (unsmob (s)) + measposp = *unsmob (s); else { - measposp = new Moment; - daddy_trans_l_->set_property ("measurePosition", smobify (measposp)); + measposp = now; } - - *measposp += dt; - // don't need to set_property - - SCM barn = get_property ("currentBarNumber"); - int b = 0; - if (gh_number_p(barn)) + + 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) { - b = gh_scm2int (barn); + Rational len = measure_length (); + + measposp += dt; + + while (measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + current_barnumber++; + internal_barnumber++; + } } - SCM cad = get_property ("timing"); - bool c= to_boolean (cad ); - Moment len = measure_length (); - while (c && *measposp >= len) - { - *measposp -= len; - b ++; - } + // 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::boot () +{ - daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b)); } +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 " + );