* GNUmakefile.in (EXTRA_DIST_FILES): remove VIM stuff.

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index c00f29ccc28c3f06747450354640f90814b916dc..927563a5759f0699f2096cf4c5bd3132cd5fa2b4 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--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
@@ -14,7 +14,7 @@
 #include "midi-stream.hh"
 #include "string-convert.hh"
 #include "warn.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
 
 
 
@@ -51,55 +51,36 @@ 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_ = new Audio_column (m);
   play_element (audio_column_);
-  start_translation_timestep ();
+  recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, UP);
 }
 
-
-void 
-Score_performer::one_time_step ()
+void
+Score_performer::finish ()
 {
-  // fixme: put this back.
-  // process_music ();
-  do_announces ();
-  stop_translation_timestep ();
-  check_removal ();
+  recurse_down_translators (daddy_context_, &Translator::finalize, UP);
 }
-
-void
-Score_performer::start ()
+  
+void 
+Score_performer::one_time_step ()
 {
+  recurse_down_translators (daddy_context_, &Performer::process_music, UP);
+  recurse_down_translators (daddy_context_, &Performer::do_announces, UP);
+  recurse_down_translators (daddy_context_, &Translator::stop_translation_timestep, UP);
 }
 
-
 int
 Score_performer::get_tempo () const
 {
   return performance_->midi_->get_tempo (Moment (Rational (1, 4)));
 }
 
-void
-Score_performer::finish ()
-{
-  check_removal ();
-  finalize ();
-}
 
 Music_output *
 Score_performer::get_output ()
@@ -112,10 +93,8 @@ Score_performer::get_output ()
 void
 Score_performer::initialize ()
 {
-  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_);
+  performance_->midi_ = dynamic_cast<Midi_def*> (get_output_def ());
 
   Translator_group::initialize ();
 }