Issue 4357/6: Extend Callback_wrapper class to extend for translator listening needs

[lilypond.git] / lily / scheme-engraver.cc

diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc
index e59903086ac750fa225e4af7c88ed412a0de5a1d..6762c753c96bb6c29bcd86086f1b292ccadb1ac8 100644 (file)
--- a/lily/scheme-engraver.cc
+++ b/lily/scheme-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  Copyright (c) 2009--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (c) 2009--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -105,7 +105,7 @@ Scheme_engraver::init_from_scheme (SCM definition)
       translator_listener_record *rec = new translator_listener_record;
       *tail = rec;
       rec->event_class_ = event_class;
-      rec->get_listener_ = &Scheme_engraver::get_listener;
+      rec->get_listener_ = &Scheme_engraver::tlr_get_listener;
       tail = &rec->next_;
     }
 
@@ -158,7 +158,7 @@ void
 Scheme_engraver::acknowledge_grob_by_hash (Grob_info info,
                                            SCM iface_function_hash)
 {
-  SCM meta = info.grob ()->internal_get_property (ly_symbol2scm ("meta"));
+  SCM meta = info.grob ()->get_property ("meta");
   SCM ifaces = scm_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta));
   for (SCM s = ifaces; scm_is_pair (s); s = scm_cdr (s))
     {
@@ -171,36 +171,15 @@ Scheme_engraver::acknowledge_grob_by_hash (Grob_info info,
     }
 }
 
-static
-void call_listen_closure (void *target, SCM ev)
-{
-  SCM cl = (SCM) target;
-  SCM func = scm_car (cl);
-  SCM engraver = scm_cdr (cl);
-  scm_call_2 (func, engraver, ev);
-}
-
-static
-void mark_listen_closure (void *target)
-{
-  scm_gc_mark ((SCM)target);
-}
-
-Listener_function_table listen_closure =
-{
-  call_listen_closure, mark_listen_closure
-};
-
 /* static */
 Listener
-Scheme_engraver::get_listener (void *arg, SCM name)
+Scheme_engraver::tlr_get_listener (void *arg, SCM name)
 {
   Scheme_engraver *me = (Scheme_engraver *) arg;
   SCM func = ly_assoc_get (name, me->listeners_alist_, SCM_BOOL_F);
   assert (ly_is_procedure (func));
 
-  SCM closure = scm_cons (func, me->self_scm ());
-  return Listener ((void *)closure, &listen_closure);
+  return me->get_listener (func);
 }
 
 translator_listener_record *