Issue 4850: Remove self method bindings of translator groups

[lilypond.git] / lily / include / translator-group.hh

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index d90c2929de2d3d93a5271fae07250108c5b730f1..4ba2fe6523d493e8b43b77cde05abfa6afb5bfe1 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -20,33 +20,10 @@
 #ifndef TRANSLATOR_GROUP_HH
 #define TRANSLATOR_GROUP_HH
 
+#include "callback.hh"
 #include "listener.hh"
 #include "translator.hh"
 
-typedef void (Translator:: *Translator_method) (void);
-typedef void (Translator_group:: *Translator_group_method) (void);
-typedef void (*Translator_group_void_method) (Translator_group *);
-
-struct Translator_method_binding
-{
-  Translator *translator_;
-  Translator::Callback method_;
-
-  Translator_method_binding ()
-  {
-  }
-  Translator_method_binding (Translator *tr, Translator::Callback ptr)
-  {
-    translator_ = tr;
-    method_ = ptr;
-  }
-  void invoke ()
-  {
-    if (method_)
-      (translator_->*method_) ();
-  }
-};
-
 class Translator_group : public Smob<Translator_group>
 {
 public:
@@ -56,12 +33,9 @@ public:
   virtual ~Translator_group ();
 private:
   void precompute_method_bindings ();
-  vector<Translator_method_binding>
+  vector<Method_instance>
   precomputed_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
 
-  Translator_group_void_method
-  precomputed_self_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
-
   SCM protected_events_;
 
   void create_child_translator (SCM);
@@ -80,12 +54,9 @@ public:
   void stop_translation_timestep ();
   void start_translation_timestep ();
 
-  virtual void fetch_precomputable_methods (Translator_group_void_method[]);
-
   Translator_group ();
 
   void precomputed_translator_foreach (Translator_precompute_index);
-  void call_precomputed_self_method (Translator_precompute_index);
 
   Context *context () const { return context_; }
 protected:
@@ -97,8 +68,8 @@ protected:
 };
 
 SCM names_to_translators (SCM namelist, Context *tg);
-void recurse_over_translators (Context *c, Translator_method ptr,
-                               Translator_group_method ptr2, Direction);
+void recurse_over_translators (Context *c, SCM tr_method,
+                               SCM tr_group_method, Direction);
 void precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir);
 Translator_group *get_translator_group (SCM sym);