X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=99d2f84967ee74f366ab5e0db653b199415bc99d;hb=918ed854dd4893789234f1a2e7854f13c0f04070;hp=c71b4c53616f565940346e78e4997e8832d925c1;hpb=b3cf2199183a184c7eef9a9f8f3c9a691db1f0ad;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index c71b4c5361..99d2f84967 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "score-performer.hh"
@@ -11,20 +11,19 @@
 #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"
 
 ADD_TRANSLATOR_GROUP (Score_performer,
 		      /* doc */ "",
 		      /* create */ "",
-		      /* accept */ "",
 		      /* read */ "",
 		      /* write */ "");
 
@@ -32,6 +31,7 @@ Score_performer::Score_performer ()
 {
   performance_ = 0;
   skipping_ = false;
+  audio_column_ = 0;
 }
 
 Score_performer::~Score_performer ()
@@ -39,19 +39,29 @@ Score_performer::~Score_performer ()
 }
 
 void
-Score_performer::play_element (Audio_element *p)
+Score_performer::announce_element (Audio_element_info info)
 {
-  if (Audio_item *i = dynamic_cast<Audio_item *> (p))
-    audio_column_->add_audio_item (i);
-  performance_->add_element (p);
+  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::announce_element (Audio_element_info info)
+Score_performer::acknowledge_audio_elements ()
 {
-  announce_infos_.push_back (info);
+  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)
 {
@@ -82,7 +92,7 @@ Score_performer::prepare (SCM sev)
   SCM sm = ev->get_property ("moment");
   Moment *m = unsmob_moment (sm);
   audio_column_ = new Audio_column (*m);
-  play_element (audio_column_);
+  announce_element (Audio_element_info (audio_column_, 0));
   precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP);
 }
 
@@ -104,7 +114,7 @@ Score_performer::one_time_step (SCM)
     {
       if (!skipping_)
         {
-	  skip_start_mom_ = audio_column_->at_mom ();
+	  skip_start_mom_ = audio_column_->when ();
 	  skipping_ = true;
         }
     }
@@ -112,11 +122,11 @@ Score_performer::one_time_step (SCM)
     {
       if (skipping_)
         {
-	  offset_mom_ -= audio_column_->at_mom () - skip_start_mom_;
+	  offset_mom_ -= audio_column_->when () - skip_start_mom_;
 	  skipping_ = false;
 	}
 
-      audio_column_->offset_at_mom (offset_mom_);
+      audio_column_->offset_when (offset_mom_);
       precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
       do_announces ();
     }
@@ -124,27 +134,12 @@ 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 ();
 }
 
@@ -153,7 +148,11 @@ Score_performer::initialize ()
 {
   performance_ = new Performance;
   performance_->unprotect ();
+  context ()->set_property ("output", performance_->self_scm ()); 
   performance_->midi_ = context ()->get_output_def ();
 
+
   Translator_group::initialize ();
 }
+
+