Issue 1375/1: Let Translator constructor take a Context argument

[lilypond.git] / lily / include / translator.icc

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index b649a1a197884aa7a86ce51d616eff51e3640675..20954ead0b6b1c670783ac07a8697421d55f0c6c 100644 (file)
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -36,7 +36,7 @@
   static void _ ## T ## _adder ()                                       \
   {                                                                     \
     T::boot ();                                                         \
-    T *t = new T;                                                       \
+    T *t = new T(0);                                                    \
     T::static_description_ =                                            \
       scm_permanent_object (t->static_translator_description ());       \
     add_translator (t);                                                 \
@@ -96,24 +96,32 @@ void add_acknowledger (SCM ptr,
                        char const *func_name,
                        SCM &ack_hash);
 
-#define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
-  add_acknowledger (Callback2_wrapper::make_smob                        \
-                    <ack_trampoline<CLASS, &CLASS::acknowledge_ ## NAME> > (), \
-                    #NAME, acknowledge_static_array_drul_[START])
+#define ADD_ACKNOWLEDGER_FOR(CLASS, NAME, GROB)                         \
+  add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (),     \
+                    #GROB, acknowledge_static_array_drul_[START])
 
-#define ADD_END_ACKNOWLEDGER(CLASS, NAME)                               \
-  add_acknowledger (Callback2_wrapper::make_smob                        \
-                    <ack_trampoline<CLASS, &CLASS::acknowledge_end_ ## NAME> > (), \
-                    #NAME, acknowledge_static_array_drul_[STOP])
+#define ADD_ACKNOWLEDGER(CLASS, NAME) ADD_ACKNOWLEDGER_FOR (CLASS, NAME, NAME)
+
+// ADD_END_ACKNOWLEDGER_FOR requires your NAME to actually be
+// end_whatever if you are utilizing acknowledge_end_whatever as a
+// different end acknowledger.
+#define ADD_END_ACKNOWLEDGER_FOR(CLASS, NAME, GROB)                     \
+  add_acknowledger (method_finder<&CLASS::acknowledge_ ## NAME> (),     \
+                    #GROB, acknowledge_static_array_drul_[STOP])
+
+#define ADD_END_ACKNOWLEDGER(CLASS, NAME)               \
+  ADD_END_ACKNOWLEDGER_FOR (CLASS, end_ ## NAME, NAME)
 
 /*
   Implement the method cl::listen_##m, and make it listen to stream
   events of class m.
  */
-#define ADD_LISTENER(cl, m)                                             \
+#define ADD_LISTENER_FOR(cl, m, ev)                                     \
   listener_list_ = scm_acons                                            \
-    (event_class_symbol (#m),                                           \
-     Callback_wrapper::make_smob                                        \
-     <trampoline <cl, &cl::listen_ ## m> > (), listener_list_)
+    (event_class_symbol (#ev),                                          \
+     method_finder<&cl::listen_ ## m> (),                               \
+     listener_list_)
+
+#define ADD_LISTENER(cl, m) ADD_LISTENER_FOR (cl, m, m)
 
 #endif /* TRANSLATOR_ICC */