X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=f494ab4191e63c2b5025afe603aef5dacb14991e;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=5e940a670d161959d191fbe133f4bbc211b6cbe3;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 5e940a670d..f494ab4191 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -30,6 +30,11 @@ using namespace std;
 #include "output-def.hh"
 #include "warn.hh"
 
+Preinit_Global_context::Preinit_Global_context ()
+{
+  output_def_ = 0;
+}
+
 Global_context::Global_context (Output_def *o)
   : Context ()
 {
@@ -40,13 +45,13 @@ Global_context::Global_context (Output_def *o)
   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),
+  event_source ()->add_listener (GET_LISTENER (Context, create_context_from_event),
                                  ly_symbol2scm ("CreateContext"));
-  event_source ()->add_listener (GET_LISTENER (prepare),
+  event_source ()->add_listener (GET_LISTENER (Global_context, prepare),
                                  ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = Context_def::unsmob (definition_);
+  Context_def *globaldef = unsmob<Context_def> (definition_);
   if (!globaldef)
     programming_error ("no `Global' context found");
   else
@@ -56,6 +61,13 @@ Global_context::Global_context (Output_def *o)
   accepts_list_ = scm_list_1 (default_child_);
 }
 
+void
+Global_context::derived_mark () const
+{
+  if (output_def_)
+    scm_gc_mark (output_def_->self_scm ());
+}
+
 Output_def *
 Global_context::get_output_def () const
 {
@@ -88,12 +100,11 @@ Global_context::get_moments_left () const
   return extra_mom_pq_.size ();
 }
 
-IMPLEMENT_LISTENER (Global_context, prepare);
 void
 Global_context::prepare (SCM sev)
 {
-  Stream_event *ev = Stream_event::unsmob (sev);
-  Moment *mom = Moment::unsmob (ev->get_property ("moment"));
+  Stream_event *ev = unsmob<Stream_event> (sev);
+  Moment *mom = unsmob<Moment> (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -114,7 +125,7 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-         ? Context::unsmob (scm_car (context_list_))
+         ? unsmob<Context> (scm_car (context_list_))
          : 0;
 }
 
@@ -169,7 +180,7 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
       if (iter->ok ())
         iter->process (w);
 
-      send_stream_event (this, "OneTimeStep", 0, 0);
+      send_stream_event (this, "OneTimeStep", 0);
       apply_finalizations ();
       check_removal ();
     }