* lily/ various: Introduce stream events of types Prepare,

[lilypond.git] / lily / global-context.cc

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 6e2d26a58a2fceb00cafeb3cb767b5c16f88395f..94f354763071d3d8700d5c432ef55f1ba2d9c18d 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -12,24 +12,33 @@
 using namespace std;
 
 #include "context-def.hh"
+#include "dispatcher.hh"
 #include "international.hh"
 #include "lilypond-key.hh"
 #include "music-iterator.hh"
 #include "music.hh"
 #include "output-def.hh"
 #include "score-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
-Global_context::Global_context (Output_def *o, Moment final, Object_key *key)
+Global_context::Global_context (Output_def *o, Object_key *key)
   : Context (new Lilypond_context_key (key,
                                       Moment (0),
                                       "Global", "", 0))
 {
   output_def_ = o;
-  final_mom_ = final;
   definition_ = find_context_def (o, ly_symbol2scm ("Global"));
-  unique_count_ = 0;
-  unique_ = 0;
+
+  now_mom_.set_infinite (-1);
+  prev_mom_.set_infinite (-1);
+
+  /* We only need the most basic stuff to bootstrap the context tree */
+  event_source ()->add_listener (GET_LISTENER (create_context_from_event),
+                                ly_symbol2scm ("CreateContext"));
+  event_source ()->add_listener (GET_LISTENER (prepare),
+                                ly_symbol2scm ("Prepare"));
+  events_below ()->register_as_listener (event_source_);
 
   Context_def *globaldef = unsmob_context_def (definition_);
   if (!globaldef)
@@ -48,9 +57,6 @@ Global_context::get_output_def () const
 void
 Global_context::add_moment_to_process (Moment m)
 {
-  if (m > final_mom_)
-    return;
-
   if (m < now_mom_)
     programming_error ("trying to freeze in time");
 
@@ -74,15 +80,26 @@ Global_context::get_moments_left () const
   return extra_mom_pq_.size ();
 }
 
+IMPLEMENT_LISTENER (Global_context, prepare);
 void
-Global_context::prepare (Moment m)
+Global_context::prepare (SCM sev)
 {
-  prev_mom_ = now_mom_;
-  now_mom_ = m;
+  Stream_event *ev = unsmob_stream_event (sev);
+  Moment *mom = unsmob_moment (ev->get_property ("moment"));
 
+  assert (mom);
+
+  if (prev_mom_.main_part_.is_infinity () && prev_mom_ < 0)
+    prev_mom_ = *mom;
+  else
+    prev_mom_ = now_mom_;
+  now_mom_ = *mom;
+  
   clear_key_disambiguations ();
+
+  // should do nothing now
   if (get_score_context ())
-    get_score_context ()->prepare (m);
+    get_score_context ()->prepare (now_mom_);
 }
 
 Moment
@@ -109,8 +126,6 @@ void
 Global_context::one_time_step ()
 {
   get_score_context ()->one_time_step ();
-  apply_finalizations ();
-  check_removal ();
 }
 
 void
@@ -123,8 +138,9 @@ Global_context::finish ()
 void
 Global_context::run_iterator_on_me (Music_iterator *iter)
 {
-  if (iter->ok ())
-    prev_mom_ = now_mom_ = iter->pending_moment ();
+  prev_mom_.set_infinite (-1);
+  now_mom_.set_infinite (-1);
+  Moment final_mom = iter->get_music ()->get_length ();
 
   bool first = true;
   while (iter->ok () || get_moments_left ())
@@ -135,7 +151,7 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
        w = iter->pending_moment ();
 
       w = sneaky_insert_extra_moment (w);
-      if (w.main_part_.is_infinity ())
+      if (w.main_part_.is_infinity () || w > final_mom)
        break;
 
       if (first)
@@ -147,13 +163,15 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
          set_property ("measurePosition", w.smobbed_copy ());
        }
 
-      prepare (w);
+      send_stream_event (this, "Prepare", 0,
+                        ly_symbol2scm ("moment"), w.smobbed_copy ());
 
       if (iter->ok ())
        iter->process (w);
 
       if (!get_score_context ())
        {
+         error ("ES TODO: no score context, this shouldn't happen");
          SCM sym = ly_symbol2scm ("Score");
          Context_def *t = unsmob_context_def (find_context_def (get_output_def (),
                                                                 sym));
@@ -168,7 +186,9 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
          sc->prepare (w);
        }
 
-      one_time_step ();
+      send_stream_event (this, "OneTimeStep", 0, 0);
+      apply_finalizations ();
+      check_removal ();
     }
 }
 
@@ -206,9 +226,3 @@ Global_context::get_default_interpreter ()
   else
     return Context::get_default_interpreter ();
 }
-
-int
-Global_context::new_unique ()
-{
-  return ++unique_count_;
-}