* lily/parser.yy (relative_music): start at middle C without pitch

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 0cb5d00a8bc449e5fadcad2a720e0a0cb32ade87..4d231ff63a34fe2a72e2a82d32261a94f88a9cb3 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,22 +3,22 @@
 
   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"
-#include "midi-def.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
 #include "warn.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
+#include "output-def.hh"
 
 
 
-ENTER_DESCRIPTION(Score_performer,
+ENTER_DESCRIPTION (Score_performer,
 /* descr */       "",
 /* creats*/       "",
 /* accepts */     "",
@@ -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_over_translators (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_over_translators (context (), &Translator::finalize, UP);
 }
-
-void
-Score_performer::start ()
+  
+void 
+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 () const
 {
-  return performance_->midi_->get_tempo (Moment (Rational (1, 4)));
+  return ::get_tempo (performance_->midi_, 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_translator_def (definition_)->apply_property_operations (this);
-  assert (dynamic_cast<Midi_def *> (output_def_));
   performance_ = new Performance;
-  performance_->midi_ = dynamic_cast<Midi_def*> (output_def_);
+  performance_->midi_ = get_output_def ();
 
   Translator_group::initialize ();
 }