X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=b69dcbe5b78f21702c7e29680b0ac115901aff3f;hb=0f7b7e90fb80f52206e3bca71357eb2a4d481235;hp=647348928440f934d9647b2fe18717c3493967fa;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 6473489284..b69dcbe5b7 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,15 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
-#include "input-translator.hh"
 #include "midi-def.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
-#include "audio-score.hh"
+#include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
 #include "debug.hh"
@@ -20,57 +19,52 @@
 #include "source.hh"
 #include "audio-staff.hh"
 
-IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer);
 
-ADD_THIS_PERFORMER(Score_performer);
+ADD_THIS_TRANSLATOR (Score_performer);
 
 
-Score_performer::Score_performer()
+Score_performer::Score_performer ()
 {
+  performance_p_ = 0;
 }
 
 
-Score_performer::~Score_performer()
+Score_performer::~Score_performer ()
 {
 }
 
-
-Translator* 
-Score_performer::ancestor_l (int l) 
-{ 
-  return Global_translator::ancestor_l (l);
-}
-
-
-int 
-Score_performer::depth_i() const 
-{ 
-  return Global_translator::depth_i();
-}
-
-
-
 void
-Score_performer::play (Audio_element * p)
+Score_performer::play_element (Audio_element * p)
 {
-  if  (p->is_type_b (Audio_item::static_name())) 
-    {
-	audio_column_l_->add ((Audio_item*)p);
-    }
-  else if (p->is_type_b (Audio_staff::static_name())) 
+  if  (Audio_item * i=dynamic_cast<Audio_item *> (p)) 
     {
-      performance_p_->add_staff ((Audio_staff*)p);
+      audio_column_l_->add_audio_item (i);
     }
-  performance_p_->add (p);
+  performance_p_->add_element (p);
 }
 
+void
+Score_performer::announce_element (Audio_element_info info)
+{
+  announce_info_arr_.push (info);
+  info.origin_trans_l_arr_.push (this);
+
+  /*
+    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);
+  */
+}
 
 void 
 Score_performer::prepare (Moment m)
 {
-  now_mom_ = m;
+  Global_translator::prepare (m);
   audio_column_l_ = new Audio_column (m);
-  performance_p_->add (audio_column_l_);
+  play_element (audio_column_l_);
+  post_move_processing ();
 }
 
 
@@ -78,10 +72,11 @@ void
 Score_performer::process()
 {
   process_requests();
+  do_announces ();
+  pre_move_processing();
+  check_removal();
 }
 
-
-
 void
 Score_performer::start()
 {
@@ -97,7 +92,8 @@ Score_performer::get_tempo_i() const
 void
 Score_performer::finish()
 {
-  Performer_group_performer::do_removal_processing();
+  check_removal ();
+  removal_processing();
 }
 
 Music_output *
@@ -107,3 +103,12 @@ Score_performer::get_output_p ()
   performance_p_ =0;
   return o;
 }
+
+void
+Score_performer::do_add_processing ()
+{
+  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_); 
+}