Run `make grand-replace'.

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 7252b0cff7832c11ce56296d51612bc842981a37..4c905446ff47cc16842008254c429cae0bd22a64 100644 (file)
--- 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--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "score-performer.hh"
@@ -11,27 +11,35 @@
 #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 */ "");
+                     /* doc */
+                     "",
+
+                     /* create */
+                     "",
+
+                     /* read */
+                     "",
+
+                     /* write */
+                     ""
+                     );
 
 Score_performer::Score_performer ()
 {
   performance_ = 0;
   skipping_ = false;
+  audio_column_ = 0;
 }
 
 Score_performer::~Score_performer ()
@@ -39,19 +47,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 +100,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 +122,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 +130,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 ();
     }
@@ -141,5 +159,8 @@ Score_performer::initialize ()
   context ()->set_property ("output", performance_->self_scm ()); 
   performance_->midi_ = context ()->get_output_def ();
 
+
   Translator_group::initialize ();
 }
+
+