X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=909ca131ac1bca67cc40cecc85eddeb08ec1bbd6;hb=c3214d7d27899529e67f9e57850167775eaf675d;hp=9c9d01e20ef4ac00946477841eba2ff30bd63534;hpb=669494d7e9ab0156a1ebc8804a24f136f551d803;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 9c9d01e20e..909ca131ac 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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
@@ -13,15 +13,23 @@
 #include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
-#include "debug.hh"
-#include "translator-def.hh"
+#include "warn.hh"
+#include "context-def.hh"
 
-ADD_THIS_TRANSLATOR (Score_performer);
+
+
+ENTER_DESCRIPTION (Score_performer,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");
 
 
 Score_performer::Score_performer ()
 {
-  performance_p_ = 0;
+  performance_ = 0;
 }
 
 
@@ -32,82 +40,61 @@ Score_performer::~Score_performer ()
 void
 Score_performer::play_element (Audio_element * p)
 {
-  if  (Audio_item * i=dynamic_cast<Audio_item *> (p)) 
+  if (Audio_item * i=dynamic_cast<Audio_item *> (p)) 
     {
-      audio_column_l_->add_audio_item (i);
+      audio_column_->add_audio_item (i);
     }
-  performance_p_->add_element (p);
+  performance_->add_element (p);
 }
 
 void
 Score_performer::announce_element (Audio_element_info info)
 {
-  announce_info_arr_.push (info);
-
-
-  /*
-    huh?
-    copied from score-engraver, but
-    this way staff gets in list twice
-  if (Audio_item* i = dynamic_cast<Audio_item*> (info.elem_l_))
-    performance_p_->add_element (i);
-  */
+  announce_infos_.push (info);
 }
 
 void 
 Score_performer::prepare (Moment m)
 {
-  Global_translator::prepare (m);
-  audio_column_l_ = new Audio_column (m);
-  play_element (audio_column_l_);
-  post_move_processing ();
+  audio_column_ = new Audio_column (m);
+  play_element (audio_column_);
+  recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, UP);
 }
 
-
-void 
-Score_performer::one_time_step ()
+void
+Score_performer::finish ()
 {
-  // fixme: put this back.
-  // process_music();
-  announces ();
-  pre_move_processing();
-  check_removal();
+  recurse_down_translators (daddy_context_, &Translator::finalize, UP);
 }
-
-void
-Score_performer::start()
+  
+void 
+Score_performer::one_time_step ()
 {
+  recurse_down_translators (daddy_context_, &Performer::process_music, UP);
+  recurse_down_translators (daddy_context_, &Performer::do_announces, UP);
+  recurse_down_translators (daddy_context_, &Translator::stop_translation_timestep, UP);
 }
 
-
 int
-Score_performer::get_tempo_i() const
+Score_performer::get_tempo () const
 {
-  return performance_p_->midi_l_->get_tempo_i (Moment (1, 4));
+  return performance_->midi_->get_tempo (Moment (Rational (1, 4)));
 }
 
-void
-Score_performer::finish()
-{
-  check_removal ();
-  removal_processing();
-}
 
 Music_output *
-Score_performer::get_output_p ()
+Score_performer::get_output ()
 {
-  Music_output * o = performance_p_;
-  performance_p_ =0;
+  Music_output * o = performance_;
+  performance_ =0;
   return o;
 }
 
 void
 Score_performer::initialize ()
 {
-  unsmob_translator_def (definition_)->apply_property_operations (this);
-  assert (dynamic_cast<Midi_def *> (output_def_l_));
-  performance_p_ = new Performance;
-  performance_p_->midi_l_ = dynamic_cast<Midi_def*>(output_def_l_);
+  performance_ = new Performance;
+  performance_->midi_ = dynamic_cast<Midi_def*> (get_output_def ());
 
   Translator_group::initialize ();
 }