X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore-performer.cc;h=0c341dd98c3635115fb67cc9416cf7a02745f098;hb=f07f18bef861d6afa48b941b7579079d5d40df80;hp=ff25e4cef436ee13d4ea51b3509e532c4229aed2;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index ff25e4cef4..0c341dd98c 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,111 +3,105 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "score-performer.hh"
-#include "midi-def.hh"
+
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
-#include "debug.hh"
-#include "translator-def.hh"
-
-ADD_THIS_TRANSLATOR (Score_performer);
-
+#include "warn.hh"
+#include "context-def.hh"
+#include "output-def.hh"
+
+ADD_TRANSLATOR (Score_performer,
+		/* descr */ "",
+		/* creats*/ "",
+		/* accepts */ "",
+		/* acks  */ "",
+		/* reads */ "",
+		/* write */ "");
 
 Score_performer::Score_performer ()
 {
-  performance_p_ = 0;
+  performance_ = 0;
 }
 
-
 Score_performer::~Score_performer ()
 {
 }
 
 void
-Score_performer::play_element (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_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 
+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_over_translators (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_over_translators (context (), &Translator::finalize, UP);
 }
 
 void
-Score_performer::start()
+Score_performer::one_time_step ()
 {
+  recurse_over_translators (context (), &Performer::process_music, UP);
+  recurse_over_translators (context (), &Performer::do_announces, UP);
+  recurse_over_translators (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 ::get_tempo (performance_->midi_, Moment (Rational (1, 4)));
 }
 
-void
-Score_performer::finish()
+SCM
+Score_performer::get_output ()
 {
-  check_removal ();
-  removal_processing();
+  Music_output *o = performance_;
+  performance_ = 0;
+  return o->self_scm ();
 }
 
-Music_output *
-Score_performer::get_output_p ()
+void
+Score_performer::derived_mark () const
 {
-  Music_output * o = performance_p_;
-  performance_p_ =0;
-  return o;
+  if (performance_)
+    scm_gc_mark (performance_->self_scm ());
+
+  Score_translator::derived_mark ();
+  Performer_group_performer::derived_mark ();
 }
 
 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;
+  scm_gc_unprotect_object (performance_->self_scm ());
+  performance_->midi_ = get_output_def ();
 
   Translator_group::initialize ();
 }