patch::: 1.3.47.jcn3

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 4729fc302e5ffe57daf5c4f1151d54bb363e77db..ad868ae9e3af77df8cd93ac8e467c67f3fa30c9c 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,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
@@ -20,20 +20,21 @@
 #include "audio-staff.hh"
 
 
-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  (Audio_item * i=dynamic_cast<Audio_item *> (p)) 
     {
@@ -42,12 +43,27 @@ Score_performer::play (Audio_element * 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)
 {
   Global_translator::prepare (m);
   audio_column_l_ = new Audio_column (m);
-  play (audio_column_l_);
+  play_element (audio_column_l_);
   post_move_processing ();
 }
 
@@ -55,7 +71,8 @@ Score_performer::prepare (Moment m)
 void 
 Score_performer::process()
 {
-  process_requests();
+  process_music();
+  do_announces ();
   pre_move_processing();
   check_removal();
 }