X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=67832e3cc5ae60d9fc44154c5f33bfd2061e41f3;hb=refs%2Fheads%2Fdebian;hp=1f356c7c19185278d715e87253d294f569c5a4cb;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 1f356c7c19..67832e3cc5 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,208 +1,260 @@ /* - timing-translator.cc -- implement Timing_translator + This file is part of LilyPond, the GNU music typesetter. + Copyright (C) 1997--2012 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" -bool -Timing_translator::do_try_music (Music*r) +void +Timing_translator::stop_translation_timestep () { - if (dynamic_cast (r)) + Global_context *global = get_global_context (); + + if (to_boolean (get_property ("timing")) + && !to_boolean (get_property ("skipBars"))) { - check_ = r; - 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; } void -Timing_translator::deprecated_process_music() +Timing_translator::initialize () { - if (check_ && measure_position ()) + Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"), + context ()->self_scm (), + ly_symbol2scm ("Timing"))); + if (timing != context ()) { - check_->origin ()->warning (_f ("barcheck failed at: %s", - measure_position ().str ())); - Moment zero; - - if (!to_boolean (get_property ("barCheckNoSynchronize"))) - daddy_trans_l_->set_property("measurePosition", zero.smobbed_copy ()); + context ()->add_alias (ly_symbol2scm ("Timing")); + + if (!timing) + { + programming_error ("Can't find Timing context template"); + timing = context (); + } } - SCM fr = get_property ("timeSignatureFraction"); - - if (scm_equal_p (fr, last_time_sig_) == SCM_BOOL_F) + 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)) { - last_time_sig_ = fr; - set_time_signature (); + 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() -{ - check_ = 0; - - Translator *t = this; - Global_translator *global_l =0; - do + if (!unsmob_moment (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"); + // A memoized constant is not the prettiest thing as a fallback + // since it does not track changes of the variable. However, + // this is still better than nothing, and we already complained + // via a programming_error + timeSignatureSettings = ly_lily_module_constant ("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 = + scm_call_2 (ly_lily_module_constant ("beam-exceptions"), + timeSignatureFraction, + timeSignatureSettings); } -} + context ()->set_property ("beamExceptions", beamExceptions); + + SCM baseMoment = timing->get_property ("baseMoment"); + if (!unsmob_moment (baseMoment)) + { + baseMoment = + Moment (ly_scm2rational + (scm_call_2 (ly_lily_module_constant ("base-length"), + timeSignatureFraction, + timeSignatureSettings))).smobbed_copy (); + } + context ()->set_property ("baseMoment", baseMoment); + SCM beatStructure = timing->get_property ("beatStructure"); + if (!scm_is_pair (beatStructure)) + { + beatStructure = + scm_call_3 (ly_lily_module_constant ("beat-structure"), + ly_rational2scm (unsmob_moment (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() -{ - 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.smobbed_copy ()); - daddy_trans_l_->set_property ("timeSignatureFraction", - gh_cons (gh_int2scm (4), gh_int2scm (4))); - - set_time_signature (); + 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_moment (l)) + return unsmob_moment (l)->main_part_; else - return Moment (1); + return Rational (1); } - -void -Timing_translator::set_time_signature () +Timing_translator::Timing_translator () { - SCM fr = get_property ("timeSignatureFraction"); - int l = gh_scm2int (gh_car (fr)); - int o = gh_scm2int (gh_cdr (fr)); - - Moment one_beat = Moment (1)/Moment (o); - Moment len = Moment (l) * one_beat; - - daddy_trans_l_->set_property ("measureLength", len.smobbed_copy ()); - daddy_trans_l_->set_property ("beatLength", one_beat.smobbed_copy ()); -} - -Timing_translator::Timing_translator() -{ - - last_time_sig_ = SCM_BOOL_F; - -} - - -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() +Timing_translator::start_translation_timestep () { - check_ =00; - 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; } - - if (!dt) + 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_moment (s)) - { - measposp = *unsmob_moment(s); - } + measposp = *unsmob_moment (s); else { - 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); + 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 ); + bool c = to_boolean (cad); - Moment len = measure_length (); - while (c && measposp >= len) + if (c) { - measposp -= len; - b ++; + Rational len = measure_length (); + + measposp += dt; + + while (measposp.main_part_ >= len) + { + measposp.main_part_ -= len; + current_barnumber++; + internal_barnumber++; + } } - daddy_trans_l_->set_property ("currentBarNumber", gh_int2scm (b)); - daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy()); + + // 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" + +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 " + );