* 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 5bb38b0ef30e9f8a04200ab044237cfd9f088530..5436975e1d9b463fa31b256762b1adac2c6c68a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-21  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * 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 ad20a3fe5f0c39b723e633c2622a42f9e914f9f4..a61d9fdf74a3c5ec496f1ae9020a0ff583a92c2e 100644 (file)
--- 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 f0ec7b3e2b4994289a38c4666b00e0cf6562bff3..cb8f00570f62d3be5cbd7fac02c9db27378a1973 100644 (file)
--- 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 8a097964307c95506a4b3c7741af0bcefc7553f2..bdf5e3ccb8e362e982e82b3504f5365307875c0f 100644 (file)
--- 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 452f40d43b66b85a4335c05367771ee51862d802..837fdf5f9e35371e9761a9bcdd0c007f0daac77e 100644 (file)
--- 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 909ca131ac1bca67cc40cecc85eddeb08ec1bbd6..54e2c90fb9e59691ad21b94af232fc27b822e8ec 100644 (file)
--- 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 b50a62c952bd69cae37fa7c8af40e4ae969e448d..0d09e91e7df99885fbb50f65cc4b272a151d7204 100644 (file)
--- 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<Translator_group*> (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)