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 927563a5759f0699f2096cf4c5bd3132cd5fa2b4..5bff2797dac2ded126f08553acd8e2a15e166544 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
+#include "moment.hh"
 #include "score-performer.hh"
-#include "midi-def.hh"
+
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "performance.hh"
@@ -15,86 +16,114 @@
 #include "string-convert.hh"
 #include "warn.hh"
 #include "context-def.hh"
+#include "output-def.hh"
+#include "context.hh"
 
-
-
-ENTER_DESCRIPTION(Score_performer,
-/* descr */       "",
-/* creats*/       "",
-/* accepts */     "",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
-
+ADD_TRANSLATOR_GROUP (Score_performer,
+                     /* doc */ "",
+                     /* create */ "",
+                     /* accept */ "",
+                     /* read */ "",
+                     /* write */ "");
 
 Score_performer::Score_performer ()
 {
   performance_ = 0;
+  skipping_ = false;
 }
 
-
 Score_performer::~Score_performer ()
 {
 }
 
 void
-Score_performer::play_element (Audio_element * p)
+Score_performer::play_element (Audio_element *p)
 {
-  if (Audio_item * i=dynamic_cast<Audio_item *> (p)) 
-    {
-      audio_column_->add_audio_item (i);
-    }
+  if (Audio_item *i = dynamic_cast<Audio_item *> (p))
+    audio_column_->add_audio_item (i);
   performance_->add_element (p);
 }
 
 void
 Score_performer::announce_element (Audio_element_info info)
 {
-  announce_infos_.push (info);
+  announce_infos_.push_back (info);
 }
 
-void 
+void
 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);
+  precomputed_recurse_over_translators (context (), START_TRANSLATION_TIMESTEP, UP);
 }
 
 void
 Score_performer::finish ()
 {
-  recurse_down_translators (daddy_context_, &Translator::finalize, UP);
+  recurse_over_translators (context (),
+                           &Translator::finalize,
+                           &Translator_group::finalize,
+                           UP);
 }
-  
-void 
+
+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);
+  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 ();
+    }
+
+  precomputed_recurse_over_translators (context (), 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)));
 }
 
-
-Music_output *
+SCM
 Score_performer::get_output ()
 {
-  Music_output * o = performance_;
-  performance_ =0;
-  return o;
+  Music_output *o = performance_;
+  performance_ = 0;
+  return o->self_scm ();
+}
+
+void
+Score_performer::derived_mark () const
+{
+  if (performance_)
+    scm_gc_mark (performance_->self_scm ());
+
+  Score_translator::derived_mark ();
+  Performer_group::derived_mark ();
 }
 
 void
 Score_performer::initialize ()
 {
   performance_ = new Performance;
-  performance_->midi_ = dynamic_cast<Midi_def*> (get_output_def ());
+  performance_->unprotect ();
+  performance_->midi_ = context ()->get_output_def ();
 
   Translator_group::initialize ();
 }