X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscheme-engraver.hh;h=e22e572c7fe6ec15c07d2728b55970e25b19096a;hb=0041871ea33b9e937e14f2fb97a32a759c7404ce;hp=997743152a169e7a1a066eb7d95a31a1a934e69b;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git diff --git a/lily/include/scheme-engraver.hh b/lily/include/scheme-engraver.hh index 997743152a..e22e572c7f 100644 --- a/lily/include/scheme-engraver.hh +++ b/lily/include/scheme-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - Copyright (c) 2009--2014 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 @@ -26,11 +26,10 @@ class Scheme_engraver : public Engraver { -public: void init_from_scheme (SCM definition); - TRANSLATOR_DECLARATIONS_NO_LISTENER (Scheme_engraver); - - static Listener get_listener (void *generic_arg, SCM event); +public: + TRANSLATOR_FAMILY_DECLARATIONS (Scheme_engraver); + Scheme_engraver (SCM definition); protected: ~Scheme_engraver (); @@ -43,7 +42,7 @@ protected: virtual void initialize (); virtual void finalize (); virtual void derived_mark () const; - virtual translator_listener_record *get_listener_list () const; + virtual SCM get_listener_list () const; virtual bool must_be_last () const; private: @@ -70,9 +69,7 @@ private: // Alist of listened-symbol . scheme-function SCM listeners_alist_; - // We dont use this, but need it for the documentation boilerplate. - static translator_listener_record *listener_list_; - translator_listener_record *per_instance_listeners_; + SCM per_instance_listeners_; }; #endif /* SCHEME_ENGRAVER_HH */