X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.icc;h=7fc128fe72f68d732fa448f9a42d4755fc17e7c3;hb=28d702692ec7fa5f4de6a60a7e165ec3305a5daf;hp=53697b38e63d4eb0040738c11f8137b27963449b;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 53697b38e6..7fc128fe72 100644
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -1,7 +1,7 @@
-/*
+/* -*- c++ -*-
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -48,18 +48,18 @@
   /* end define */
 
 #define DEFINE_TRANSLATOR_LISTENER_LIST(T) \
-  translator_listener_record *T::listener_list_;        \
+  Protected_scm T::listener_list_ (SCM_EOL);    \
   /* end define */
 
 #define DEFINE_ACKNOWLEDGERS(classname) \
   Drul_array< vector<Acknowledge_information> > classname::acknowledge_static_array_drul_;      \
-  Engraver_void_function_engraver_grob_info                             \
+  Translator::Grob_info_callback                                        \
   classname::static_get_acknowledger (SCM sym)                          \
   {                                                                     \
     return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[START]);      \
   }                                                                     \
-  Engraver_void_function_engraver_grob_info                             \
-  classname::static_get_end_acknowledger (SCM sym)                              \
+  Translator::Grob_info_callback                                        \
+  classname::static_get_end_acknowledger (SCM sym)                      \
   {                                                                     \
     return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[STOP]);       \
   }                                                                     \
@@ -78,52 +78,52 @@
   DEFINE_TRANSLATOR_DOC(classname, desc, grobs, read, write)            \
   DEFINE_ACKNOWLEDGERS(classname) \
   DEFINE_TRANSLATOR_LISTENER_LIST(classname) \
- 
+
 #define IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS(T)                        \
   void                                                                  \
-  T::fetch_precomputable_methods (Translator_void_method_ptr ptrs[])    \
+  T::fetch_precomputable_methods (Translator::Callback ptrs[])		\
   {                                                                     \
     ptrs[START_TRANSLATION_TIMESTEP] =                                  \
-      ((Translator_void_method_ptr) & T::start_translation_timestep ==  \
-       (Translator_void_method_ptr) & Translator::start_translation_timestep) \
-      ? 0                                                               \
-      : (Translator_void_method_ptr) & T::start_translation_timestep;   \
-                                                                        \
-    ptrs[STOP_TRANSLATION_TIMESTEP] =                                   \
-      ((Translator_void_method_ptr) & T::stop_translation_timestep == (Translator_void_method_ptr) & Translator::stop_translation_timestep) \
-      ? 0                                                               \
-      : (Translator_void_method_ptr) & T::stop_translation_timestep;    \
-                                                                        \
-    ptrs[PROCESS_MUSIC] =                                               \
-      ((Translator_void_method_ptr) & T::process_music == (Translator_void_method_ptr) & Translator::process_music) \
-      ? 0                                                               \
-      : (Translator_void_method_ptr) & T::process_music;                \
-                                                                        \
-    ptrs[PROCESS_ACKNOWLEDGED] =                                        \
-      ((Translator_void_method_ptr) & T::process_acknowledged == (Translator_void_method_ptr) & Translator::process_acknowledged) \
-      ? 0                                                               \
-      : (Translator_void_method_ptr) & T::process_acknowledged;         \
+      (&T::start_translation_timestep					\
+       == &Translator::start_translation_timestep)			\
+      ? 0								\
+      : static_cast<Callback> (&T::start_translation_timestep);		\
+									\
+    ptrs[STOP_TRANSLATION_TIMESTEP] =					\
+      (& T::stop_translation_timestep == & Translator::stop_translation_timestep) \
+      ? 0								\
+      : static_cast<Callback> (&T::stop_translation_timestep);		\
+									\
+    ptrs[PROCESS_MUSIC] =						\
+      (&T::process_music == &Translator::process_music)			\
+      ? 0								\
+      : static_cast<Callback> (&T::process_music);			\
+									\
+    ptrs[PROCESS_ACKNOWLEDGED] =					\
+      (&T::process_acknowledged == &Translator::process_acknowledged)	\
+      ? 0								\
+      : static_cast<Callback> (&T::process_acknowledged);		\
   }
 
-void add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
+void add_acknowledger (Translator::Grob_info_callback ptr,
                        char const *func_name,
                        vector<Acknowledge_information> *ack_array);
 
-Engraver_void_function_engraver_grob_info
+Translator::Grob_info_callback
 generic_get_acknowledger (SCM sym,
                           vector<Acknowledge_information> const *ack_array);
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
   void CLASS ## NAME ## _ack_adder ()                                   \
   {                                                                     \
-    add_acknowledger ((Engraver_void_function_engraver_grob_info) & CLASS::acknowledge_ ## NAME, #NAME, &CLASS::acknowledge_static_array_drul_[START]); \
+    add_acknowledger (static_cast<Translator::Grob_info_callback> (&CLASS::acknowledge_ ## NAME), #NAME, &CLASS::acknowledge_static_array_drul_[START]); \
   }                                                                     \
   ADD_SCM_INIT_FUNC (CLASS ## NAME ## _ack_adder_initclass, CLASS ## NAME ## _ack_adder);
 
 #define ADD_END_ACKNOWLEDGER(CLASS, NAME)                                       \
   void CLASS ## NAME ## _end_ack_adder ()                                       \
   {                                                                     \
-    add_acknowledger ((Engraver_void_function_engraver_grob_info) & CLASS::acknowledge_end_ ## NAME, #NAME, &CLASS::acknowledge_static_array_drul_[STOP]); \
+    add_acknowledger (static_cast<Translator::Grob_info_callback> (&CLASS::acknowledge_end_ ## NAME), #NAME, &CLASS::acknowledge_static_array_drul_[STOP]); \
   }                                                                     \
   ADD_SCM_INIT_FUNC (CLASS ## NAME ## _end_ack_adder_initclass, CLASS ## NAME ## _end_ack_adder);
 
@@ -135,27 +135,12 @@ generic_get_acknowledger (SCM sym,
 void                                                    \
 cl :: _internal_declare_ ## m ()                        \
 {                                                       \
-  static translator_listener_record r;                  \
-  add_translator_listener (&listener_list_, &r, _get_ ## m ## _listener, #m); \
-}                                                       \
-                                                        \
-ADD_SCM_INIT_FUNC (cl ## _declare_event_ ## m, cl::_internal_declare_ ## m);    \
-                                                        \
-Listener                                                \
- cl :: _get_ ## m ## _listener (void *me, SCM unused)   \
-{                                                       \
-  cl *obj = (cl *) me;                                  \
-  (void) unused; \
-  return obj->GET_LISTENER (_listen_scm_ ## m);         \
-}                                                       \
-                                                        \
-IMPLEMENT_LISTENER (cl, _listen_scm_ ## m)              \
-void                                                    \
-cl::_listen_scm_ ## m (SCM sev)                         \
-{                                                       \
-  Stream_event *ev = unsmob_stream_event (sev);         \
-  protect_event (sev);                                  \
-  listen_ ## m (ev);                                    \
-}
+  listener_list_ = scm_acons                                            \
+    (event_class_symbol (#m),                                           \
+     Callback_wrapper::make_smob<cl, Stream_event *, &cl::listen_ ## m> (), \
+     listener_list_);                                                   \
+}                                                                       \
+                                                                        \
+ADD_SCM_INIT_FUNC (cl ## _declare_event_ ## m, cl::_internal_declare_ ## m);
 
 #endif /* TRANSLATOR_ICC */