X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=c45e29de0ac2b989a80d7c0eadc726d57362f2a7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3bb6b4255f8787cb0d2493a7890dc9e6c09199eb;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 3bb6b4255f..c45e29de0a 100644
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -1,9 +1,20 @@
 /*
-  translator-group.hh -- declare Translator_group
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef TRANSLATOR_GROUP_HH
@@ -11,7 +22,6 @@
 
 #include "listener.hh"
 #include "translator.hh"
-#include "std-vector.hh"
 
 typedef void (Translator:: *Translator_method) (void);
 typedef void (Translator_group:: *Translator_group_method) (void);
@@ -33,12 +43,17 @@ struct Translator_method_binding
   void invoke ()
   {
     if (method_)
-      (*method_) (translator_);
+      (translator_->*method_) ();
   }
 };
 
-class Translator_group
+class Translator_group : public Smob<Translator_group>
 {
+public:
+  SCM mark_smob ();
+  int print_smob (SCM, scm_print_state *);
+  static const char type_p_name_[];
+  virtual ~Translator_group ();
 private:
   void precompute_method_bindings ();
   vector<Translator_method_binding>
@@ -47,20 +62,21 @@ private:
   Translator_group_void_method
   precomputed_self_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT];
 
-  DECLARE_LISTENER (eat_event);
+  SCM protected_events_;
 
-public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group);
-  DECLARE_SMOBS (Translator_group, dummy);
+  DECLARE_LISTENER (create_child_translator);
 
 public:
-  void connect_to_context (Context *c);
-  virtual Translator_group *get_daddy_translator ()const;
+  DECLARE_CLASSNAME (Translator_group);
+
+  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 ();
 
@@ -74,7 +90,6 @@ public:
   Context *context () const { return context_; }
 protected:
   SCM simple_trans_list_;
-  SCM accept_hash_table_;
   Context *context_;
 
   friend class Context_def;
@@ -83,13 +98,12 @@ protected:
 
 SCM names_to_translators (SCM namelist, Context *tg);
 void recurse_over_translators (Context *c, Translator_method ptr,
-			       Translator_group_method ptr2, Direction);
+                               Translator_group_method ptr2, Direction);
 void precomputed_recurse_over_translators (Context *c, Translator_precompute_index idx, Direction dir);
 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);
 
 #endif // TRANSLATOR_GROUP_HH