X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=749aa18e47b3e80d5ea0aa16384f72e69130a76c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9efa2fd4b55f6ac35ce64e1546b4ec425fc42724;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 9efa2fd4b5..749aa18e47 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -4,205 +4,144 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include "debug.hh" #include "timing-translator.hh" -#include "command-request.hh" + +#include "warn.hh" #include "translator-group.hh" -#include "global-translator.hh" +#include "global-context.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. */ - -bool -Timing_translator::try_music (Music*r) -{ - if (dynamic_cast (r)) - { - check_ = r; - return true; - } - return false; -} - -void -Timing_translator::deprecated_process_music() -{ - if (check_ && measure_position ()) - { - 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 ()); - } - - SCM fr = get_property ("timeSignatureFraction"); - - if (scm_equal_p (fr, last_time_sig_) == SCM_BOOL_F) - { - last_time_sig_ = fr; - set_time_signature (); - } -} - - void -Timing_translator::stop_translation_timestep() +Timing_translator::stop_translation_timestep () { - check_ = 0; - - Translator *t = this; - Global_translator *global_l =0; - do - { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); - } - while (!global_l); - - /* allbars == ! skipbars */ - SCM sb = get_property ("skipBars"); - bool allbars = !to_boolean (sb); + Global_context *global = get_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) + if (to_boolean (get_property ("timing")) + && !to_boolean (get_property ("skipBars"))) { - Moment barleft = (measure_length () - measure_position ()); + Moment barleft = (measure_length () - measure_position (context ())); + Moment now = now_mom (); if (barleft > Moment (0)) - global_l->add_moment_to_process (now_mom () + barleft); + { + Moment nextmom = now + barleft; + nextmom.grace_part_ = Rational (0); + global->add_moment_to_process (nextmom); + } } } - -ADD_THIS_TRANSLATOR(Timing_translator); - void -Timing_translator::do_creation_processing() +Timing_translator::initialize () { - 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 ()->add_alias (ly_symbol2scm ("Timing")); + context ()->set_property ("currentBarNumber", scm_from_int (1)); + context ()->set_property ("internalBarNumber", scm_from_int (1)); + + context ()->set_property ("timeSignatureFraction", + scm_cons (scm_from_int (4), scm_from_int (4))); + /* + 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 ()); } -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); -} - - -void -Timing_translator::set_time_signature () -{ - 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; - + return Rational (1); } - -Moment -Timing_translator::measure_position () const +Timing_translator::Timing_translator () { - 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::start_translation_timestep() +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; + } + else if (dt.main_part_.is_infinity ()) + { + programming_error ("moving infinitely to future"); dt = 0; } - - if (!dt) + + 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 = now; + context ()->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); - } + + 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) + Rational len = measure_length (); + while (c && measposp.main_part_ >= len) { - measposp -= len; - b ++; + 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()); + 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 */ + "internalBarNumber " + "currentBarNumber " + "measureLength " + "measurePosition ", + + /* write */ + "internalBarNumber " + "currentBarNumber " + "measurePosition " + );