Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 53c2a283f7ed38f0a8b053c0db6338d90713989d..5bff2797dac2ded126f08553acd8e2a15e166544 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,102 +3,127 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
+#include "moment.hh"
 #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);
-
-ADD_THIS_PERFORMER(Score_performer);
-
-
-Score_performer::Score_performer()
+#include "warn.hh"
+#include "context-def.hh"
+#include "output-def.hh"
+#include "context.hh"
+
+ADD_TRANSLATOR_GROUP (Score_performer,
+                     /* doc */ "",
+                     /* create */ "",
+                     /* accept */ "",
+                     /* read */ "",
+                     /* write */ "");
+
+Score_performer::Score_performer ()
 {
+  performance_ = 0;
+  skipping_ = false;
 }
 
-
-Score_performer::~Score_performer()
+Score_performer::~Score_performer ()
 {
 }
 
-
-Translator* 
-Score_performer::ancestor_l (int l) 
-{ 
-    return Global_translator::ancestor_l (l);
+void
+Score_performer::play_element (Audio_element *p)
+{
+  if (Audio_item *i = dynamic_cast<Audio_item *> (p))
+    audio_column_->add_audio_item (i);
+  performance_->add_element (p);
 }
 
-
-int 
-Score_performer::depth_i() const 
-{ 
-    return Global_translator::depth_i();
+void
+Score_performer::announce_element (Audio_element_info info)
+{
+  announce_infos_.push_back (info);
 }
 
-
 void
-Score_performer::finish()
+Score_performer::prepare (Moment m)
 {
-    Performer_group_performer::do_removal_processing();
+  audio_column_ = new Audio_column (m);
+  play_element (audio_column_);
+  precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP);
 }
 
+void
+Score_performer::finish ()
+{
+  recurse_over_translators (context (),
+                           &Translator::finalize,
+                           &Translator_group::finalize,
+                           UP);
+}
 
 void
-Score_performer::play (Audio_element * p)
+Score_performer::one_time_step ()
 {
-    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 (to_boolean (context ()->get_property ("skipTypesetting")))
+    {
+      if (!skipping_)
+        {
+         skip_start_mom_ = audio_column_->at_mom ();
+         skipping_ = true;
+        }
+    }
+  else
+    {
+      if (skipping_)
+        {
+         offset_mom_ -= audio_column_->at_mom () - skip_start_mom_;
+         skipping_ = false;
+       }
+
+      audio_column_->offset_at_mom (offset_mom_);
+      precomputed_recurse_over_translators (context (), PROCESS_MUSIC, UP);
+      do_announces ();
     }
-    score_l_->audio_score_p_->add (p);
-}
 
+  precomputed_recurse_over_translators (context (), STOP_TRANSLATION_TIMESTEP, UP);
+}
 
-void 
-Score_performer::prepare (Moment m)
+int
+Score_performer::get_tempo () const
 {
-    now_mom_ = m;
-    audio_column_l_ = new Audio_column (m);
-    score_l_->audio_score_p_->add (audio_column_l_);
+  return ::get_tempo (performance_->midi_, Moment (Rational (1, 4)));
 }
 
-
-void 
-Score_performer::process()
+SCM
+Score_performer::get_output ()
 {
-    process_requests();
+  Music_output *o = performance_;
+  performance_ = 0;
+  return o->self_scm ();
 }
 
-
 void
-Score_performer::set_score (Score* score_l)
+Score_performer::derived_mark () const
 {
-    Global_translator::set_score (score_l);
-}
+  if (performance_)
+    scm_gc_mark (performance_->self_scm ());
 
+  Score_translator::derived_mark ();
+  Performer_group::derived_mark ();
+}
 
 void
-Score_performer::start()
+Score_performer::initialize ()
 {
-}
+  performance_ = new Performance;
+  performance_->unprotect ();
+  performance_->midi_ = context ()->get_output_def ();
 
-
-int
-Score_performer::get_tempo_i()const
-{
-    return score_l_->midi_p_->get_tempo_i (Moment (1, 4));
+  Translator_group::initialize ();
 }