X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator.cc;h=370f7771c0dcf2a95148ee964b97f4ccd00eb284;hb=cce6142535a66c88811f7f9f28eba89b8fc3b9a3;hp=d6874ef78ca35d90a0e4a088405183961f17870c;hpb=20a1118d86072c27a1f3eacbaa888c4ee3287ec6;p=lilypond.git

diff --git a/lily/translator.cc b/lily/translator.cc
index d6874ef78c..370f7771c0 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -118,48 +118,38 @@ Translator::finalize ()
 void
 Translator::connect_to_context (Context *c)
 {
-  for (translator_listener_record *r = get_listener_list (); r; r = r->next_)
-    c->events_below ()->add_listener (r->get_listener_ (this, r->event_class_),
-                                      r->event_class_);
+  for (SCM r = get_listener_list (); scm_is_pair (r); r = scm_cdr (r))
+    {
+      SCM event_class = scm_caar (r);
+      SCM callback = scm_cdar (r);
+
+      c->events_below ()->add_listener (get_listener (callback),
+                                        event_class);
+    }
 }
 
 void
 Translator::disconnect_from_context (Context *c)
 {
-  for (translator_listener_record *r = get_listener_list (); r; r = r->next_)
-    c->events_below ()->remove_listener (r->get_listener_ (this, r->event_class_),
-                                         r->event_class_);
-}
+  for (SCM r = get_listener_list (); scm_is_pair (r); r = scm_cdr (r))
+    {
+      SCM event_class = scm_caar (r);
+      SCM callback = scm_cdar (r);
 
-/*
-  internally called once, statically, for each translator
-  listener. Connects the name of an event class with a procedure that
-  fetches the corresponding listener.
+      c->events_below ()->remove_listener (get_listener (callback),
+                                           event_class);
+    }
+}
 
-  The method should only be called from the macro
-  IMPLEMENT_TRANSLATOR_LISTENER.
- */
-void
-Translator::add_translator_listener (translator_listener_record **listener_list,
-                                     translator_listener_record *r,
-                                     Listener (*get_listener) (void *, SCM),
-                                     const char *ev_class)
+SCM
+Translator::event_class_symbol (const char *ev_class)
 {
   /* ev_class is the C++ identifier name. Convert to scm symbol */
   string name = string (ev_class);
   name = replace_all (&name, '_', '-');
   name += "-event";
 
-  // we make the symbol permanent in order not to have to bother about
-  // the static translator_listener_record chains while garbage
-  // collecting.
-
-  SCM class_sym = scm_permanent_object (scm_from_ascii_symbol (name.c_str ()));
-
-  r->event_class_ = class_sym;
-  r->get_listener_ = get_listener;
-  r->next_ = *listener_list;
-  *listener_list = r;
+  return scm_from_ascii_symbol (name.c_str ());
 }
 
 /*
@@ -168,7 +158,7 @@ Translator::add_translator_listener (translator_listener_record **listener_list,
 SCM
 Translator::static_translator_description (const char *grobs,
                                            const char *desc,
-                                           translator_listener_record *listener_list,
+                                           SCM listener_list,
                                            const char *read,
                                            const char *write) const
 {
@@ -181,8 +171,8 @@ Translator::static_translator_description (const char *grobs,
                                  scm_from_utf8_string (desc), static_properties);
 
   SCM list = SCM_EOL;
-  for (; listener_list; listener_list = listener_list->next_)
-    list = scm_cons (listener_list->event_class_, list);
+  for (; scm_is_pair (listener_list); listener_list = scm_cdr (listener_list))
+    list = scm_cons (scm_caar (listener_list), list);
   static_properties = scm_acons (ly_symbol2scm ("events-accepted"),
                                  list, static_properties);
 
@@ -199,7 +189,7 @@ Translator::static_translator_description (const char *grobs,
   SMOBS
 */
 SCM
-Translator::mark_smob ()
+Translator::mark_smob () const
 {
   derived_mark ();
   return SCM_EOL;
@@ -231,7 +221,7 @@ Translator::derived_mark () const
 }
 
 int
-Translator::print_smob (SCM port, scm_print_state *)
+Translator::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Translator ", port);
   scm_puts (class_name (), port);
@@ -273,7 +263,7 @@ generic_get_acknowledger (SCM sym, vector<Acknowledge_information> const *ack_ar
 Moment
 get_event_length (Stream_event *e)
 {
-  Moment *m = Moment::unsmob (e->get_property ("length"));
+  Moment *m = unsmob<Moment> (e->get_property ("length"));
   if (m)
     return *m;
   else