X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=ad868ae9e3af77df8cd93ac8e467c67f3fa30c9c;hb=41e82f1eed38b69f60f74221c52ce14692318d6d;hp=75e9fc2200c020a7469489602fd0c0bc220168d0;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 75e9fc2200..ad868ae9e3 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 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
@@ -19,31 +19,43 @@
 #include "source.hh"
 #include "audio-staff.hh"
 
-IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer);
-ADD_THIS_TRANSLATOR(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 ()
 {
 }
 
 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 
@@ -51,7 +63,7 @@ Score_performer::prepare (Moment 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 ();
 }
 
@@ -59,7 +71,8 @@ Score_performer::prepare (Moment m)
 void 
 Score_performer::process()
 {
-  process_requests();
+  process_music();
+  do_announces ();
   pre_move_processing();
   check_removal();
 }
@@ -92,10 +105,10 @@ Score_performer::get_output_p ()
 }
 
 void
-Score_performer::add_processing ()
+Score_performer::do_add_processing ()
 {
-  Translator_group::add_processing ();
-  assert (output_def_l_->is_type_b (Midi_def::static_name ()));
+  Translator_group::do_add_processing ();
+  assert (dynamic_cast<Midi_def *> (output_def_l_));
   performance_p_ = new Performance;
-  performance_p_->midi_l_ = (Midi_def*) output_def_l_;  
+  performance_p_->midi_l_ = dynamic_cast<Midi_def*>(output_def_l_); 
 }