-/*
+/* -*- c++ -*-
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2011 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
static void _ ## T ## _adder () \
{ \
T *t = new T; \
- T::static_description_ = t->static_translator_description (); \
- scm_permanent_object (T::static_description_); \
+ T::static_description_ = \
+ scm_permanent_object (t->static_translator_description ()); \
add_translator (t); \
} \
SCM T::translator_description () const \
/* 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 \
+ Drul_array<
std::vector<Acknowledge_information> > classname::acknowledge_static_array_drul_; \
+ 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]); \
} \
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);
+
std::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);
+
std::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);
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 */
projects / lilypond.git / blobdiff