Update.

[lilypond.git] / lily / score-performer.cc

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 31f9ecdade04ba9b4ff72a8c71110e838e665384..b5983bb25e25f3ce26806c8ebb6ea37a56355947 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -16,14 +16,14 @@
 #include "warn.hh"
 #include "context-def.hh"
 #include "output-def.hh"
+#include "context.hh"
 
-ADD_TRANSLATOR (Score_performer,
-               /* descr */ "",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "",
-               /* write */ "");
+ADD_TRANSLATOR_GROUP (Score_performer,
+                     /* doc */ "",
+                     /* create */ "",
+                     /* accept */ "",
+                     /* read */ "",
+                     /* write */ "");
 
 Score_performer::Score_performer ()
 {
@@ -38,9 +38,7 @@ void
 Score_performer::play_element (Audio_element *p)
 {
   if (Audio_item *i = dynamic_cast<Audio_item *> (p))
-    {
-      audio_column_->add_audio_item (i);
-    }
+    audio_column_->add_audio_item (i);
   performance_->add_element (p);
 }
 
@@ -55,21 +53,24 @@ Score_performer::prepare (Moment m)
 {
   audio_column_ = new Audio_column (m);
   play_element (audio_column_);
-  recurse_over_translators (context (), &Translator::start_translation_timestep, UP);
+  precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP);
 }
 
 void
 Score_performer::finish ()
 {
-  recurse_over_translators (context (), &Translator::finalize, UP);
+  recurse_over_translators (context (),
+                           &Translator::finalize,
+                           &Translator_group::finalize,
+                           UP);
 }
 
 void
 Score_performer::one_time_step ()
 {
-  recurse_over_translators (context (), &Performer::process_music, UP);
-  recurse_over_translators (context (), &Performer::do_announces, UP);
-  recurse_over_translators (context (), &Translator::stop_translation_timestep, UP);
+  precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
+  do_announces ();
+  precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP);
 }
 
 int
@@ -78,19 +79,30 @@ Score_performer::get_tempo () const
   return ::get_tempo (performance_->midi_, Moment (Rational (1, 4)));
 }
 
-Music_output *
+SCM
 Score_performer::get_output ()
 {
   Music_output *o = performance_;
   performance_ = 0;
-  return o;
+  return o->self_scm ();
+}
+
+void
+Score_performer::derived_mark () const
+{
+  if (performance_)
+    scm_gc_mark (performance_->self_scm ());
+
+  Score_translator::derived_mark ();
+  Performer_group::derived_mark ();
 }
 
 void
 Score_performer::initialize ()
 {
   performance_ = new Performance;
-  performance_->midi_ = get_output_def ();
+  performance_->unprotect ();
+  performance_->midi_ = context ()->get_output_def ();
 
   Translator_group::initialize ();
 }