X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscheme-engraver.cc;h=42ab3f036783cbc1c8489d6517b689cb33d7dd98;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=fc51d439c0e90eed08dbaf4b89c06d1c2f04ca16;hpb=56a1519b44d1a0a8500c43236ae644053cc1f25b;p=lilypond.git

diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc
index fc51d439c0..42ab3f0367 100644
--- a/lily/scheme-engraver.cc
+++ b/lily/scheme-engraver.cc
@@ -27,20 +27,16 @@
 
 #include "scm-hash.hh"
 
-Scheme_engraver::Scheme_engraver (SCM definition)
+Preinit_Scheme_engraver::Preinit_Scheme_engraver ()
 {
   initialize_function_ = SCM_EOL;
   finalize_function_ = SCM_EOL;
 
-  interface_acknowledger_hash_ = SCM_EOL;
-  interface_end_acknowledger_hash_ = SCM_EOL;
+  interface_acknowledger_hash_.set (SCM_EOL, SCM_EOL);
 
-  must_be_last_ = false;
   per_instance_listeners_ = SCM_EOL;
   for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++)
     precomputable_methods_[i] = SCM_UNDEFINED;
-
-  init_from_scheme (definition);
 }
 
 Scheme_engraver::~Scheme_engraver ()
@@ -68,8 +64,8 @@ Scheme_engraver::fetch_precomputable_methods (SCM ptrs[])
     ptrs[i] = precomputable_methods_[i];
 }
 
-void
-Scheme_engraver::init_from_scheme (SCM definition)
+Scheme_engraver::Scheme_engraver (SCM definition, Context *c)
+  : Engraver (c)
 {
   precomputable_methods_[START_TRANSLATION_TIMESTEP]
     = callable (ly_symbol2scm ("start-translation-timestep"), definition);
@@ -111,8 +107,7 @@ Scheme_engraver::init_from_scheme (SCM definition)
                                       definition, SCM_EOL));
 
   per_instance_listeners_ = listeners;
-  interface_acknowledger_hash_ = hash1;
-  interface_end_acknowledger_hash_ = hash2;
+  interface_acknowledger_hash_.set (hash1, hash2);
 
   // It's not defined whether Scheme_engraver::derived_mark is already
   // active while the construction is underway, so we make sure we
@@ -172,6 +167,6 @@ Scheme_engraver::derived_mark () const
   scm_gc_mark (initialize_function_);
   scm_gc_mark (finalize_function_);
   scm_gc_mark (per_instance_listeners_);
-  scm_gc_mark (interface_acknowledger_hash_);
-  scm_gc_mark (interface_end_acknowledger_hash_);
+  scm_gc_mark (interface_acknowledger_hash_[START]);
+  scm_gc_mark (interface_acknowledger_hash_[STOP]);
 }