X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=a3b1abf6c6ba04eccdf9442dabfb5c19c67785db;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=3da26d540c6b8ddf7e227e230f1bfac71b608784;hpb=34f168ae4ed3379964f4009e4a823a7114dcb71a;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 3da26d540c..a3b1abf6c6 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,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
@@ -13,86 +13,109 @@
 #include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
-#include "debug.hh"
-#include "score.hh"
-#include "source-file.hh"
-#include "source.hh"
-#include "audio-staff.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()
+
+Score_performer::Score_performer ()
 {
+  performance_ = 0;
 }
 
 
-Score_performer::~Score_performer()
+Score_performer::~Score_performer ()
 {
 }
 
 void
-Score_performer::play (Audio_element * p)
+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_infos_.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_))
+    performance_->add_element (i);
+  */
 }
 
 void 
 Score_performer::prepare (Moment m)
 {
   Global_translator::prepare (m);
-  audio_column_l_ = new Audio_column (m);
-  play (audio_column_l_);
-  post_move_processing ();
+  audio_column_ = new Audio_column (m);
+  play_element (audio_column_);
+  start_translation_timestep ();
 }
 
 
 void 
-Score_performer::process()
+Score_performer::one_time_step ()
 {
-  process_requests();
+  // fixme: put this back.
+  // process_music ();
   do_announces ();
-  pre_move_processing();
-  check_removal();
+  stop_translation_timestep ();
+  check_removal ();
 }
 
 void
-Score_performer::start()
+Score_performer::start ()
 {
 }
 
 
 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()
+Score_performer::finish ()
 {
   check_removal ();
-  removal_processing();
+  finalize ();
 }
 
 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::do_add_processing ()
+Score_performer::initialize ()
 {
-  Translator_group::do_add_processing ();
-  assert (dynamic_cast<Midi_def *> (output_def_l_));
-  performance_p_ = new Performance;
-  performance_p_->midi_l_ = dynamic_cast<Midi_def*>(output_def_l_); 
+  unsmob_context_def (definition_)->apply_default_property_operations (this);
+  assert (dynamic_cast<Midi_def *> (output_def_));
+  performance_ = new Performance;
+  performance_->midi_ = dynamic_cast<Midi_def*> (output_def_);
+
+  Translator_group::initialize ();
 }