X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=a777ba26307961c7b57005f8cf80c27a5489fdae;hb=ab0d7437ee820fd14b629b52bdc39377f4175263;hp=625944ba2d6c9e6c6177cc1451d430d1549b83b3;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 625944ba2d..a777ba2630 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -3,14 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #ifndef TRANSLATOR_GROUP_HH #define TRANSLATOR_GROUP_HH +#include "listener.hh" #include "translator.hh" -#include "std-vector.hh" typedef void (Translator:: *Translator_method) (void); typedef void (Translator_group:: *Translator_group_method) (void); @@ -40,23 +40,29 @@ class Translator_group { private: void precompute_method_bindings (); - std::vector + vector precomputed_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT]; Translator_group_void_method precomputed_self_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT]; + SCM protected_events_; + + DECLARE_LISTENER (create_child_translator); + public: VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group); - DECLARE_SMOBS (Translator_group, dummy); + DECLARE_SMOBS (Translator_group); public: - virtual Translator_group *get_daddy_translator ()const; + virtual void connect_to_context (Context *c); + virtual void disconnect_from_context (); virtual SCM get_simple_trans_list (); - virtual bool try_music (Music *req); virtual void initialize (); virtual void finalize (); + void protect_event (SCM ev); + void stop_translation_timestep (); void start_translation_timestep (); @@ -70,7 +76,6 @@ public: Context *context () const { return context_; } protected: SCM simple_trans_list_; - SCM accept_hash_table_; Context *context_; friend class Context_def; @@ -84,7 +89,7 @@ void precomputed_recurse_over_translators (Context *c, Translator_precompute_ind Translator_group *get_translator_group (SCM sym); #define foobar -#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, accepted, read, write) foobar +#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, read, write) foobar DECLARE_UNSMOB (Translator_group, translator_group);