X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-context.cc;h=f494ab4191e63c2b5025afe603aef5dacb14991e;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=c21deb3b9ba54651c20cf21237d5ba538a249dc2;hpb=0b25807868f2e1f3372a8fb5e19d9036dec53ecc;p=lilypond.git diff --git a/lily/global-context.cc b/lily/global-context.cc index c21deb3b9b..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 () { @@ -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 { @@ -168,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 (); }