X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscheme-engraver.cc;h=8d2054161bf716b577c4f4a4c61442cbd584cd13;hb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;hp=e59903086ac750fa225e4af7c88ed412a0de5a1d;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc index e59903086a..8d2054161b 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--2011 Han-Wen Nienhuys + Copyright (c) 2009--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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)) { @@ -186,9 +186,19 @@ void mark_listen_closure (void *target) scm_gc_mark ((SCM)target); } -Listener_function_table listen_closure = +static +bool equal_listen_closure (void *a, void *b) +{ + SCM target_a = (SCM) a; + SCM target_b = (SCM) b; + + return ly_is_equal (target_a, target_b); +} + +Listener_function_table listen_closure += { - call_listen_closure, mark_listen_closure + call_listen_closure, mark_listen_closure, equal_listen_closure }; /* static */