* lily/ledger-line-spanner.cc (print): swap linear_combination

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 927563a5759f0699f2096cf4c5bd3132cd5fa2b4..4d231ff63a34fe2a72e2a82d32261a94f88a9cb3 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -7,7 +7,6 @@
  */
 
 #include "score-performer.hh"
-#include "midi-def.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "performance.hh"
@@ -15,10 +14,11 @@
 #include "string-convert.hh"
 #include "warn.hh"
 #include "context-def.hh"
+#include "output-def.hh"
 
 
 
-ENTER_DESCRIPTION(Score_performer,
+ENTER_DESCRIPTION (Score_performer,
 /* descr */       "",
 /* creats*/       "",
 /* accepts */     "",
@@ -58,27 +58,27 @@ Score_performer::prepare (Moment m)
 {
   audio_column_ = new Audio_column (m);
   play_element (audio_column_);
-  recurse_down_translators (daddy_context_, &Translator::start_translation_timestep, UP);
+  recurse_over_translators (context (), &Translator::start_translation_timestep, UP);
 }
 
 void
 Score_performer::finish ()
 {
-  recurse_down_translators (daddy_context_, &Translator::finalize, UP);
+  recurse_over_translators (context (), &Translator::finalize, UP);
 }
   
 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);
+  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)));
 }
 
 
@@ -94,7 +94,7 @@ void
 Score_performer::initialize ()
 {
   performance_ = new Performance;
-  performance_->midi_ = dynamic_cast<Midi_def*> (get_output_def ());
+  performance_->midi_ = get_output_def ();
 
   Translator_group::initialize ();
 }