From: David Kastrup Date: Tue, 16 Sep 2014 07:44:14 +0000 (+0200) Subject: Issue 4107/1: Use START/STOP for *recurse_over_translators instead of the counterintu... X-Git-Tag: release/2.19.15-1~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=113223f5d488baf62b0e1a7bf4c2cfee037f4e0e;p=lilypond.git Issue 4107/1: Use START/STOP for *recurse_over_translators instead of the counterintuitive DOWN/UP --- diff --git a/lily/context.cc b/lily/context.cc index da18102401..79c6cadf6f 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -50,7 +50,7 @@ Context::check_removal () { recurse_over_translators (ctx, &Translator::finalize, &Translator_group::finalize, - UP); + STOP); send_stream_event (ctx, "RemoveContext", 0, 0); } } diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 54f34575d2..6281f166f4 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -53,7 +53,7 @@ IMPLEMENT_LISTENER (Score_engraver, prepare); void Score_engraver::prepare (SCM) { - precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, DOWN); + precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, START); } IMPLEMENT_LISTENER (Score_engraver, finish); @@ -62,7 +62,7 @@ Score_engraver::finish (SCM) { recurse_over_translators (context (), &Translator::finalize, &Translator_group::finalize, - UP); + STOP); } #define MUSIC_FONT "emmentaler-20" diff --git a/lily/score-performer.cc b/lily/score-performer.cc index e14fa62638..521ebe36a3 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -111,7 +111,7 @@ Score_performer::prepare (SCM sev) Moment *m = Moment::unsmob (sm); audio_column_ = new Audio_column (*m); announce_element (Audio_element_info (audio_column_, 0)); - precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP); + precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, STOP); } IMPLEMENT_LISTENER (Score_performer, finish); @@ -124,7 +124,7 @@ Score_performer::finish (SCM) recurse_over_translators (context (), &Translator::finalize, &Translator_group::finalize, - UP); + STOP); } IMPLEMENT_LISTENER (Score_performer, one_time_step); @@ -159,11 +159,11 @@ Score_performer::one_time_step (SCM) } audio_column_->offset_when (offset_mom_); - precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP); + precomputed_recurse_over_translators (context (), PROCESS_MUSIC, STOP); do_announces (); } - precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP); + precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, STOP); } void diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 23aae462e5..a1139fe30e 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -226,7 +226,7 @@ Translator_group::create_child_translator (SCM sev) recurse_over_translators (new_context, &Translator::initialize, &Translator_group::initialize, - DOWN); + START); } SCM @@ -241,7 +241,7 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id Translator_group *tg = dynamic_cast (c->implementation ()); - if (tg && dir == DOWN) + if (tg && dir == START) { tg->precomputed_translator_foreach (idx); tg->call_precomputed_self_method (idx); @@ -251,7 +251,7 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id s = scm_cdr (s)) precomputed_recurse_over_translators (Context::unsmob (scm_car (s)), idx, dir); - if (tg && dir == UP) + if (tg && dir == STOP) { tg->precomputed_translator_foreach (idx); tg->call_precomputed_self_method (idx); @@ -265,7 +265,7 @@ recurse_over_translators (Context *c, Translator_method ptr, Translator_group *tg = dynamic_cast (c->implementation ()); - if (tg && dir == DOWN) + if (tg && dir == START) { (tg->*tg_ptr) (); translator_each (tg->get_simple_trans_list (), ptr); @@ -275,7 +275,7 @@ recurse_over_translators (Context *c, Translator_method ptr, s = scm_cdr (s)) recurse_over_translators (Context::unsmob (scm_car (s)), ptr, tg_ptr, dir); - if (tg && dir == UP) + if (tg && dir == STOP) { translator_each (tg->get_simple_trans_list (), ptr);