X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=c6b245ba61b25da7b4a0223bf126d22a069ebdb7;hb=b0434fc1950930130ab67c8a61d37e8579c7ac73;hp=05b560b4bdb4a14e304ad588852afa8974a46e2a;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 05b560b4bd..c6b245ba61 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,10 +1,20 @@ /* - 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--2005 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 "timing-translator.hh" @@ -12,54 +22,60 @@ #include "warn.hh" #include "translator-group.hh" #include "global-context.hh" -#include "multi-measure-rest.hh" void Timing_translator::stop_translation_timestep () { Global_context *global = get_global_context (); - /* 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) + if (to_boolean (get_property ("timing")) + && !to_boolean (get_property ("skipBars"))) { Moment barleft = (measure_length () - measure_position (context ())); Moment now = now_mom (); - if (barleft > Moment (0) - /* - Hmm. We insert the bar moment every time we process a - moment. A waste of cpu? - */ - && !now.grace_part_) - global->add_moment_to_process (now + barleft); + if (barleft > Moment (0)) + { + Moment nextmom = now + barleft; + nextmom.grace_part_ = Rational (0); + global->add_moment_to_process (nextmom); + } } } void Timing_translator::initialize () { + Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"), + context ()->self_scm (), + ly_symbol2scm ("Timing"))); + if (timing != context ()) + { + context ()->add_alias (ly_symbol2scm ("Timing")); - /* - move this to engraver-init.ly? - */ - context ()->add_alias (ly_symbol2scm ("Timing")); - context ()->set_property ("timing", SCM_BOOL_T); - context ()->set_property ("currentBarNumber", scm_from_int (1)); + if (!timing) + { + programming_error ("Can't find Timing context template"); + timing = context (); + } + } + + 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); context ()->set_property ("timeSignatureFraction", - scm_cons (scm_from_int (4), scm_from_int (4))); + timing->get_property ("timeSignatureFraction")); /* Do not init measurePosition; this should be done from global context. */ - context ()->set_property ("measureLength", Moment (Rational (1)).smobbed_copy ()); - context ()->set_property ("beatLength", Moment (Rational (1, 4)).smobbed_copy ()); + context ()->set_property ("measureLength", + timing->get_property ("measureLength")); + context ()->set_property ("baseMoment", + timing->get_property ("baseMoment")); } Rational @@ -76,7 +92,6 @@ Timing_translator::Timing_translator () { } - void Timing_translator::start_translation_timestep () { @@ -102,24 +117,18 @@ Timing_translator::start_translation_timestep () SCM s = get_property ("measurePosition"); if (unsmob_moment (s)) - { - measposp = *unsmob_moment (s); - } + measposp = *unsmob_moment (s); else { measposp = now; context ()->set_property ("measurePosition", - measposp.smobbed_copy ()); + measposp.smobbed_copy ()); } measposp += dt; - SCM barn = get_property ("currentBarNumber"); - int b = 0; - if (scm_is_number (barn)) - { - b = scm_to_int (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); @@ -128,24 +137,41 @@ Timing_translator::start_translation_timestep () while (c && measposp.main_part_ >= len) { measposp.main_part_ -= len; - b++; + current_barnumber++; + internal_barnumber++; } - context ()->set_property ("currentBarNumber", scm_from_int (b)); + 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, - "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}. " - "\n\nThis engraver adds the alias @code{Timing} to its containing context." - - , - - "", "", "", ""); + /* 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 " + );