X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=6e0e1c4379af9b971a00944e2e964414b850742a;hb=d8082113a0df616e7beabc0417c3590a3fac7320;hp=df2f1f516096b91532a2dedb59e4e2adb45562d3;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index df2f1f5160..6e0e1c4379 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -12,23 +12,32 @@
 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 "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"));
 
+  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)
     programming_error ("no `Global' context found");
@@ -46,9 +55,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");
 
@@ -72,15 +78,22 @@ 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 ();
-  if (get_score_context ())
-    get_score_context ()->prepare (m);
 }
 
 Moment
@@ -89,40 +102,30 @@ Global_context::now_mom () const
   return now_mom_;
 }
 
-Score_context *
+Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-    ? dynamic_cast<Score_context *> (unsmob_context (scm_car (context_list_)))
+    ? unsmob_context (scm_car (context_list_))
     : 0;
 }
 
 SCM
 Global_context::get_output ()
 {
-  return get_score_context ()->get_output ();
-}
-
-void
-Global_context::one_time_step ()
-{
-  get_score_context ()->one_time_step ();
-  apply_finalizations ();
-  check_removal ();
-}
-
-void
-Global_context::finish ()
-{
-  if (get_score_context ())
-    get_score_context ()->finish ();
+  Context * c = get_score_context ();
+  if (c)
+    return c->get_property ("output");
+  else
+    return SCM_EOL;
 }
 
 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 ())
@@ -133,9 +136,16 @@ 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 (w == prev_mom_)
+	{
+	  programming_error ("Moment is not increasing. Aborting interpretation.");
+	  break ;
+	}
+
+      
       if (first)
 	{
 	  /*
@@ -145,28 +155,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 ())
-	{
-	  SCM sym = ly_symbol2scm ("Score");
-	  Context_def *t = unsmob_context_def (find_context_def (get_output_def (),
-								 sym));
-	  if (!t)
-	    error (_f ("can't find `%s' context", "Score"));
-
-	  Object_key const *key = get_context_key ("Score", "");
-	  Context *c = t->instantiate (SCM_EOL, key);
-	  add_context (c);
-
-	  Score_context *sc = dynamic_cast<Score_context *> (c);
-	  sc->prepare (w);
-	}
-
-      one_time_step ();
+      send_stream_event (this, "OneTimeStep", 0, 0);
+      apply_finalizations ();
+      check_removal ();
     }
 }