X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=5bff2797dac2ded126f08553acd8e2a15e166544;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=2bdfdd54b9101bcb967742b29ca5875b9b999743;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 2bdfdd54b9..5bff2797da 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -6,22 +6,18 @@
   (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "moment.hh"
 #include "score-performer.hh"
 
 #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 "audio-staff.hh"
-#include "audio-item.hh"
+#include "context-def.hh"
+#include "output-def.hh"
+#include "context.hh"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
 		      /* doc */ "",
@@ -34,7 +30,6 @@ Score_performer::Score_performer ()
 {
   performance_ = 0;
   skipping_ = false;
-  audio_column_ = 0;
 }
 
 Score_performer::~Score_performer ()
@@ -42,65 +37,29 @@ Score_performer::~Score_performer ()
 }
 
 void
-Score_performer::announce_element (Audio_element_info info)
-{
-  announce_infos_.push_back (info);
-  if (Audio_staff *s = dynamic_cast<Audio_staff*> (info.elem_))
-    {
-      performance_->audio_staffs_.push_back (s);
-    }
-
-  performance_->add_element (info.elem_);
-}
-
-void
-Score_performer::acknowledge_audio_elements ()
-{
-  for (vsize i = 0; i < announce_infos_.size (); i++)
-    {
-      if (Audio_item *ai = dynamic_cast<Audio_item *> (announce_infos_[i].elem_))
-	audio_column_->add_audio_item (ai);
-    }
-  Performer_group::acknowledge_audio_elements ();
-}
-
-
-void
-Score_performer::connect_to_context (Context *c)
+Score_performer::play_element (Audio_element *p)
 {
-  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"));
+  if (Audio_item *i = dynamic_cast<Audio_item *> (p))
+    audio_column_->add_audio_item (i);
+  performance_->add_element (p);
 }
 
 void
-Score_performer::disconnect_from_context ()
+Score_performer::announce_element (Audio_element_info info)
 {
-  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 ();
+  announce_infos_.push_back (info);
 }
 
-IMPLEMENT_LISTENER (Score_performer, prepare);
 void
-Score_performer::prepare (SCM sev)
+Score_performer::prepare (Moment 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);
+  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 (SCM)
+Score_performer::finish ()
 {
   recurse_over_translators (context (),
 			    &Translator::finalize,
@@ -108,9 +67,8 @@ Score_performer::finish (SCM)
 			    UP);
 }
 
-IMPLEMENT_LISTENER (Score_performer, one_time_step);
 void
-Score_performer::one_time_step (SCM)
+Score_performer::one_time_step ()
 {
   if (to_boolean (context ()->get_property ("skipTypesetting")))
     {
@@ -136,12 +94,27 @@ Score_performer::one_time_step (SCM)
   precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP);
 }
 
+int
+Score_performer::get_tempo () const
+{
+  return ::get_tempo (performance_->midi_, Moment (Rational (1, 4)));
+}
+
+SCM
+Score_performer::get_output ()
+{
+  Music_output *o = performance_;
+  performance_ = 0;
+  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 ();
 }
 
@@ -150,11 +123,7 @@ Score_performer::initialize ()
 {
   performance_ = new Performance;
   performance_->unprotect ();
-  context ()->set_property ("output", performance_->self_scm ()); 
   performance_->midi_ = context ()->get_output_def ();
 
-
   Translator_group::initialize ();
 }
-
-