*** empty log message ***

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index ea27d507b84c9482364ca1f25d7878a1a41cfa24..b127d32bdfeee3a4427cea980a3c0cea1bc2110f 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,102 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "score-performer.hh"
-#include "input-translator.hh"
-#include "midi-def.hh"
+
 #include "audio-column.hh"
 #include "audio-item.hh"
-#include "audio-score.hh"
+#include "performance.hh"
 #include "midi-stream.hh"
 #include "string-convert.hh"
-#include "debug.hh"
-#include "score.hh"
-#include "source-file.hh"
-#include "source.hh"
-#include "audio-staff.hh"
-
-IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer);
+#include "warn.hh"
+#include "context-def.hh"
+#include "output-def.hh"
 
-ADD_THIS_PERFORMER(Score_performer);
+ADD_TRANSLATOR (Score_performer,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");
 
 
-Score_performer::Score_performer()
+Score_performer::Score_performer ()
 {
+  performance_ = 0;
 }
 
 
-Score_performer::~Score_performer()
+Score_performer::~Score_performer ()
 {
 }
 
-
-Translator* 
-Score_performer::ancestor_l(int l) 
-{ 
-    return Global_translator::ancestor_l(l);
-}
-
-
-int 
-Score_performer::depth_i() const 
-{ 
-    return Global_translator::depth_i();
-}
-
-
 void
-Score_performer::finish()
+Score_performer::play_element (Audio_element * p)
 {
-    Performer_group_performer::do_removal_processing();
+  if (Audio_item * i = dynamic_cast<Audio_item *> (p)) 
+    {
+      audio_column_->add_audio_item (i);
+    }
+  performance_->add_element (p);
 }
 
-
 void
-Score_performer::play(Audio_element * p)
+Score_performer::announce_element (Audio_element_info info)
 {
-    if  (p->is_type_b(Audio_item::static_name())) {
-       audio_column_l_->add( (Audio_item*)p);
-    } else if (p->is_type_b(Audio_staff::static_name())) {
-       score_l_->audio_score_p_->add_staff( (Audio_staff*)p );
-    }
-    score_l_->audio_score_p_->add(p);
+  announce_infos_.push (info);
 }
 
-
 void 
-Score_performer::prepare(Moment m)
+Score_performer::prepare (Moment m)
 {
-    now_mom_ = m;
-    audio_column_l_ = new Audio_column(m);
-    score_l_->audio_score_p_->add(audio_column_l_);
+  audio_column_ = new Audio_column (m);
+  play_element (audio_column_);
+  recurse_over_translators (context (), &Translator::start_translation_timestep, UP);
 }
 
-
+void
+Score_performer::finish ()
+{
+  recurse_over_translators (context (), &Translator::finalize, UP);
+}
+  
 void 
-Score_performer::process()
+Score_performer::one_time_step ()
 {
-    process_requests();
+  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);
 }
 
-
-void
-Score_performer::set_score(Score* score_l)
+int
+Score_performer::get_tempo () const
 {
-    Global_translator::set_score(score_l);
+  return ::get_tempo (performance_->midi_, Moment (Rational (1, 4)));
 }
 
 
-void
-Score_performer::start()
+Music_output *
+Score_performer::get_output ()
 {
+  Music_output * o = performance_;
+  performance_ = 0;
+  return o;
 }
 
-
-int
-Score_performer::get_tempo_i()const
+void
+Score_performer::initialize ()
 {
-    return score_l_->midi_p_->get_tempo_i(Moment(1, 4));
+  performance_ = new Performance;
+  performance_->midi_ = get_output_def ();
+
+  Translator_group::initialize ();
 }