* lily/ various: Introduce stream events of types Prepare,

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index ed9e4077755fa465dcb2630ef648878f5f68782d..c71b4c53616f565940346e78e4997e8832d925c1 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -10,13 +10,16 @@
 
 #include "audio-column.hh"
 #include "audio-item.hh"
+#include "context-def.hh"
+#include "context.hh"
+#include "dispatcher.hh"
+#include "global-context.hh"
 #include "performance.hh"
 #include "midi-stream.hh"
+#include "moment.hh"
+#include "output-def.hh"
 #include "string-convert.hh"
 #include "warn.hh"
-#include "context-def.hh"
-#include "output-def.hh"
-#include "context.hh"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
                      /* doc */ "",
@@ -28,6 +31,7 @@ ADD_TRANSLATOR_GROUP (Score_performer,
 Score_performer::Score_performer ()
 {
   performance_ = 0;
+  skipping_ = false;
 }
 
 Score_performer::~Score_performer ()
@@ -49,15 +53,42 @@ Score_performer::announce_element (Audio_element_info info)
 }
 
 void
-Score_performer::prepare (Moment m)
+Score_performer::connect_to_context (Context *c)
+{
+  Performer_group::connect_to_context (c);
+  
+  Dispatcher *d = c->get_global_context ()->event_source ();
+  d->add_listener (GET_LISTENER (one_time_step), ly_symbol2scm ("OneTimeStep"));
+  d->add_listener (GET_LISTENER (prepare), ly_symbol2scm ("Prepare"));
+  d->add_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish"));
+}
+
+void
+Score_performer::disconnect_from_context ()
+{
+  Dispatcher *d = context ()->get_global_context ()->event_source ();
+  d->remove_listener (GET_LISTENER (one_time_step), ly_symbol2scm ("OneTimeStep"));
+  d->remove_listener (GET_LISTENER (prepare), ly_symbol2scm ("Prepare"));
+  d->remove_listener (GET_LISTENER (finish), ly_symbol2scm ("Finish"));
+
+  Performer_group::disconnect_from_context ();
+}
+
+IMPLEMENT_LISTENER (Score_performer, prepare);
+void
+Score_performer::prepare (SCM sev)
 {
-  audio_column_ = new Audio_column (m);
+  Stream_event *ev = unsmob_stream_event (sev);
+  SCM sm = ev->get_property ("moment");
+  Moment *m = unsmob_moment (sm);
+  audio_column_ = new Audio_column (*m);
   play_element (audio_column_);
   precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP);
 }
 
+IMPLEMENT_LISTENER (Score_performer, finish);
 void
-Score_performer::finish ()
+Score_performer::finish (SCM)
 {
   recurse_over_translators (context (),
                            &Translator::finalize,
@@ -65,11 +96,31 @@ Score_performer::finish ()
                            UP);
 }
 
+IMPLEMENT_LISTENER (Score_performer, one_time_step);
 void
-Score_performer::one_time_step ()
+Score_performer::one_time_step (SCM)
 {
-  precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
-  do_announces ();
+  if (to_boolean (context ()->get_property ("skipTypesetting")))
+    {
+      if (!skipping_)
+        {
+         skip_start_mom_ = audio_column_->at_mom ();
+         skipping_ = true;
+        }
+    }
+  else
+    {
+      if (skipping_)
+        {
+         offset_mom_ -= audio_column_->at_mom () - skip_start_mom_;
+         skipping_ = false;
+       }
+
+      audio_column_->offset_at_mom (offset_mom_);
+      precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
+      do_announces ();
+    }
+
   precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP);
 }