X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdispatcher.cc;h=0d899f94ba7ea27cfcc0b610ee4bd14d0eecb52f;hb=ec305926ab34fef53ff694bcf9c799460fe4dbcc;hp=4db7c93a1555a66a9cffc6772ea9ac349a263379;hpb=84cad110c3bbaeca8e5144dba7f8756b89100396;p=lilypond.git

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index 4db7c93a15..0d899f94ba 100644
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -77,19 +77,13 @@ void
 Dispatcher::dispatch (SCM sev)
 {
   Stream_event *ev = unsmob_stream_event (sev);
-  SCM class_symbol = ev->get_property ("class");
-  if (!scm_is_symbol (class_symbol))
-    {
-      warning (_ ("Event class should be a symbol"));
-      return;
-    }
-
-  SCM class_list = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_symbol);
+  SCM class_list = ev->get_property ("class");
   if (!scm_is_pair (class_list))
     {
-      ev->origin ()->warning (_f ("Unknown event class %s", ly_symbol2string (class_symbol).c_str ()));
+      ev->origin ()->warning (_ ("Event class should be a list"));
       return;
     }
+
 #if 0
   bool sent = false;
 #endif
@@ -174,17 +168,9 @@ Dispatcher::dispatch (SCM sev)
 }
 
 bool
-Dispatcher::is_listened (Stream_event *ev)
+Dispatcher::is_listened_class (SCM cl)
 {
-  SCM class_symbol = ev->get_property ("class");
-  if (!scm_is_symbol (class_symbol))
-    {
-      warning (_ ("Event class should be a symbol"));
-      return false;
-    }
-
-  for (SCM cl = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_symbol);
-       scm_is_pair (cl); cl = scm_cdr (cl))
+  for (; scm_is_pair (cl); cl = scm_cdr (cl))
     {
       SCM list = scm_hashq_ref (listeners_, scm_car (cl), SCM_EOL);
       if (scm_is_pair (list))
@@ -193,6 +179,23 @@ Dispatcher::is_listened (Stream_event *ev)
   return false;
 }
 
+static SCM
+accumulate_types (void * /* closure */,
+                  SCM key,
+                  SCM val,
+                  SCM result)
+{
+  if (scm_is_pair (val))
+    return scm_cons (key, result);
+  return result;
+}
+
+SCM
+Dispatcher::listened_types ()
+{
+  return scm_internal_hash_fold ((scm_t_hash_fold_fn) &accumulate_types,
+                                 NULL, SCM_EOL, listeners_);
+}
 
 void
 Dispatcher::broadcast (Stream_event *ev)
@@ -256,7 +259,7 @@ Dispatcher::remove_listener (Listener l, SCM ev_class)
   scm_hashq_set_x (listeners_, ev_class, list);
 
   if (first)
-    warning ("Attempting to remove nonexisting listener.");
+    warning (_ ("Attempting to remove nonexisting listener."));
   else if (!scm_is_pair (list))
     {
       /* Unregister with all dispatchers. */
@@ -278,7 +281,7 @@ Dispatcher::register_as_listener (Dispatcher *disp)
   // Don't register twice to the same dispatcher.
   if (scm_assq (disp->self_scm (), dispatchers_) != SCM_BOOL_F)
     {
-      warning ("Already listening to dispatcher, ignoring request");
+      warning (_ ("Already listening to dispatcher, ignoring request"));
       return;
     }