X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscheme-engraver.cc;h=7e601f8db7563014ad81b18a02981f6bf811780e;hb=d30e3c1c699f5b84424b76ebf0ab944490015886;hp=cde829a60788bec5b140942dad26a6fd75168184;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc
index cde829a607..7e601f8db7 100644
--- 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--2012 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
@@ -33,24 +33,16 @@ Scheme_engraver::Scheme_engraver ()
   process_acknowledged_function_ = SCM_EOL;
   initialize_function_ = SCM_EOL;
   finalize_function_ = SCM_EOL;
-  listeners_alist_ = SCM_EOL;
 
   interface_acknowledger_hash_ = SCM_EOL;
   interface_end_acknowledger_hash_ = SCM_EOL;
 
   must_be_last_ = false;
-  per_instance_listeners_ = 0;
+  per_instance_listeners_ = SCM_EOL;
 }
 
 Scheme_engraver::~Scheme_engraver ()
 {
-  translator_listener_record *next = 0;
-  for (translator_listener_record *r = per_instance_listeners_;
-       r; r = next)
-    {
-      next = r->next_;
-      delete r;
-    }
 }
 
 // Extracts the value if callable, if not return #f.
@@ -82,13 +74,12 @@ Scheme_engraver::init_from_scheme (SCM definition)
 
   SCM listeners = ly_assoc_get (ly_symbol2scm ("listeners"), definition, SCM_EOL);
 
-  listeners_alist_ = SCM_EOL;
+  per_instance_listeners_ = SCM_EOL;
 
   must_be_last_ = to_boolean (ly_assoc_get (ly_symbol2scm ("must-be-last"),
                                             definition,
                                             SCM_BOOL_F));
 
-  translator_listener_record **tail = &per_instance_listeners_;
   for (SCM p = listeners; scm_is_pair (p); p = scm_cdr (p))
     {
       SCM event_class = scm_caar (p);
@@ -100,13 +91,7 @@ Scheme_engraver::init_from_scheme (SCM definition)
       // We should check the arity of the function?
 
       // Record for later lookup.
-      listeners_alist_ = scm_acons (event_class, proc, listeners_alist_);
-
-      translator_listener_record *rec = new translator_listener_record;
-      *tail = rec;
-      rec->event_class_ = event_class;
-      rec->get_listener_ = &Scheme_engraver::get_listener;
-      tail = &rec->next_;
+      per_instance_listeners_ = scm_acons (event_class, proc, per_instance_listeners_);
     }
 
   init_acknowledgers (ly_assoc_get (ly_symbol2scm ("acknowledgers"),
@@ -158,7 +143,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,40 +156,7 @@ 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 *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);
-}
-
-translator_listener_record *
+SCM
 Scheme_engraver::get_listener_list () const
 {
   return per_instance_listeners_;
@@ -234,7 +186,7 @@ Scheme_engraver::derived_mark () const
   scm_gc_mark (finalize_function_);
   scm_gc_mark (process_music_function_);
   scm_gc_mark (process_acknowledged_function_);
-  scm_gc_mark (listeners_alist_);
+  scm_gc_mark (per_instance_listeners_);
   scm_gc_mark (interface_acknowledger_hash_);
   scm_gc_mark (interface_end_acknowledger_hash_);
 }