release: 1.1.1

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 53c2a283f7ed38f0a8b053c0db6338d90713989d..48822afc4c3dbdbb627cc8e91aa931d67106a05b 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,15 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--1998 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"
@@ -21,8 +20,7 @@
 #include "audio-staff.hh"
 
 IMPLEMENT_IS_TYPE_B1(Score_performer,Performer_group_performer);
-
-ADD_THIS_PERFORMER(Score_performer);
+ADD_THIS_TRANSLATOR(Score_performer);
 
 
 Score_performer::Score_performer()
@@ -34,71 +32,70 @@ 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()
-{
-    Performer_group_performer::do_removal_processing();
-}
-
-
 void
 Score_performer::play (Audio_element * p)
 {
-    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);
+  if  (dynamic_cast<Audio_item *> (p)) 
+    {
+      audio_column_l_->add_audio_item ((Audio_item*)p);
     }
-    score_l_->audio_score_p_->add (p);
+  else if (dynamic_cast<Audio_staff *> (p)) 
+    {
+      performance_p_->add_staff ((Audio_staff*)p);
+    }
+  performance_p_->add_element (p);
 }
 
-
 void 
 Score_performer::prepare (Moment m)
 {
-    now_mom_ = m;
-    audio_column_l_ = new Audio_column (m);
-    score_l_->audio_score_p_->add (audio_column_l_);
+  Global_translator::prepare (m);
+  audio_column_l_ = new Audio_column (m);
+  performance_p_->add_column (audio_column_l_);
+  post_move_processing ();
 }
 
 
 void 
 Score_performer::process()
 {
-    process_requests();
+  process_requests();
+  pre_move_processing();
+  check_removal();
 }
 
-
 void
-Score_performer::set_score (Score* score_l)
+Score_performer::start()
 {
-    Global_translator::set_score (score_l);
 }
 
 
+int
+Score_performer::get_tempo_i() const
+{
+  return performance_p_->midi_l_->get_tempo_i (Moment (1, 4));
+}
+
 void
-Score_performer::start()
+Score_performer::finish()
 {
+  check_removal ();
+  removal_processing();
 }
 
+Music_output *
+Score_performer::get_output_p ()
+{
+  Music_output * o = performance_p_;
+  performance_p_ =0;
+  return o;
+}
 
-int
-Score_performer::get_tempo_i()const
+void
+Score_performer::do_add_processing ()
 {
-    return score_l_->midi_p_->get_tempo_i (Moment (1, 4));
+  Translator_group::do_add_processing ();
+  assert (dynamic_cast<Midi_def *> (output_def_l_));
+  performance_p_ = new Performance;
+  performance_p_->midi_l_ = (Midi_def*) output_def_l_;  
 }