Merge branch 'master' into translation

[lilypond.git] / lily / include / scheme-engraver.hh

diff --git a/lily/include/scheme-engraver.hh b/lily/include/scheme-engraver.hh
index 997743152a169e7a1a066eb7d95a31a1a934e69b..c7d16d76e9c10145d090472de46688384279f6dd 100644 (file)
--- 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 <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
@@ -30,8 +30,6 @@ public:
   void init_from_scheme (SCM definition);
   TRANSLATOR_DECLARATIONS_NO_LISTENER (Scheme_engraver);
 
-  static Listener get_listener (void *generic_arg, SCM event);
-
 protected:
   ~Scheme_engraver ();
 
@@ -43,7 +41,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:
@@ -71,8 +69,8 @@ private:
   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_;
+  static Protected_scm listener_list_;
+  SCM per_instance_listeners_;
 };
 
 #endif /* SCHEME_ENGRAVER_HH */