From: Han-Wen Nienhuys Date: Sun, 21 Mar 2004 13:54:27 +0000 (+0000) Subject: * lily/performer-group-performer.cc (do_announces): call X-Git-Tag: release/2.1.33~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=422dd033c2e5ed106438edfa4f4745baf91a17e9;p=lilypond.git * lily/performer-group-performer.cc (do_announces): call Performer_group_performer::create_audio_elements () too. * lily/global-context.cc (get_default_interpreter): new function. Override from base class, so no new Score contexts are created. --- diff --git a/ChangeLog b/ChangeLog index 5bb38b0ef3..5436975e1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-03-21 Han-Wen Nienhuys + * lily/performer-group-performer.cc (do_announces): call + Performer_group_performer::create_audio_elements () too. + * scripts/convert-ly.py (conv): add rule for breakAlignOrder. * scm/define-grobs.scm (all-grob-descriptions): add property break-align-orders diff --git a/lily/context.cc b/lily/context.cc index ad20a3fe5f..a61d9fdf74 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -35,7 +35,7 @@ Context::check_removal () trg->check_removal (); if (trg->is_removable ()) { - recurse_down_translators (trg, &Translator::finalize, UP); + recurse_over_translators (trg, &Translator::finalize, UP); remove_context (trg); } } @@ -73,7 +73,7 @@ Context::add_context (Context*t) */ td->apply_default_property_operations (t); - recurse_down_translators (t, &Translator::initialize, DOWN); + recurse_over_translators (t, &Translator::initialize, DOWN); } } diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index f0ec7b3e2b..cb8f00570f 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -31,7 +31,7 @@ public: SCM names_to_translators (SCM namelist, Context*tg); -void recurse_down_translators (Context * c, Translator_method ptr, Direction); +void recurse_over_translators (Context * c, Translator_method ptr, Direction); void translator_each (SCM list, Translator_method method); diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index 8a09796430..bdf5e3ccb8 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -56,6 +56,7 @@ Performer_group_performer::do_announces () { while (1) { + create_audio_elements (); performer_each (get_simple_trans_list (), &Performer::create_audio_elements); diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 452f40d43b..837fdf5f9e 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -80,7 +80,7 @@ Score_engraver::prepare (Moment m) command_column_->set_property ("when", w); musical_column_->set_property ("when", w); - recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, DOWN); + recurse_over_translators (daddy_context_, &Translator::start_translation_timestep, DOWN); } void @@ -89,7 +89,7 @@ Score_engraver::finish () if ((breaks_%8)) progress_indication ("[" + to_string (breaks_) + "]"); - recurse_down_translators (daddy_context_, &Translator::finalize, UP); + recurse_over_translators (daddy_context_, &Translator::finalize, UP); } /* @@ -139,11 +139,11 @@ Score_engraver::one_time_step () { if (!to_boolean (get_property ("skipTypesetting"))) { - recurse_down_translators (daddy_context_, &Engraver::process_music, UP); - recurse_down_translators (daddy_context_, &Engraver::do_announces, UP); + recurse_over_translators (daddy_context_, &Engraver::process_music, UP); + recurse_over_translators (daddy_context_, &Engraver::do_announces, UP); } - recurse_down_translators (daddy_context_, &Translator::stop_translation_timestep, UP); + recurse_over_translators (daddy_context_, &Translator::stop_translation_timestep, UP); } void diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 909ca131ac..54e2c90fb9 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -58,21 +58,21 @@ Score_performer::prepare (Moment m) { audio_column_ = new Audio_column (m); play_element (audio_column_); - recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, UP); + recurse_over_translators (daddy_context_, &Translator::start_translation_timestep, UP); } void Score_performer::finish () { - recurse_down_translators (daddy_context_, &Translator::finalize, UP); + recurse_over_translators (daddy_context_, &Translator::finalize, UP); } void Score_performer::one_time_step () { - recurse_down_translators (daddy_context_, &Performer::process_music, UP); - recurse_down_translators (daddy_context_, &Performer::do_announces, UP); - recurse_down_translators (daddy_context_, &Translator::stop_translation_timestep, UP); + recurse_over_translators (daddy_context_, &Performer::process_music, UP); + recurse_over_translators (daddy_context_, &Performer::do_announces, UP); + recurse_over_translators (daddy_context_, &Translator::stop_translation_timestep, UP); } int diff --git a/lily/translator-group.cc b/lily/translator-group.cc index b50a62c952..0d09e91e7d 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -126,9 +126,8 @@ Translator_group::get_simple_trans_list () return simple_trans_list_; } - void -recurse_down_translators (Context * c, Translator_method ptr, Direction dir) +recurse_over_translators (Context * c, Translator_method ptr, Direction dir) { Translator_group * tg = dynamic_cast (unsmob_translator (c->implementation_)); @@ -148,7 +147,7 @@ recurse_down_translators (Context * c, Translator_method ptr, Direction dir) for (SCM s = c->context_list_ ; gh_pair_p (s); s =gh_cdr (s)) { - recurse_down_translators (unsmob_context (gh_car (s)), ptr, dir); + recurse_over_translators (unsmob_context (gh_car (s)), ptr, dir); } if (dir == UP)