Issue 4357/2: Make dispatchers callable for dispatching

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index efb3ca506c0d2bcf2d533daeaee75f25acdd5a75..a394a4b7a80e0bd6017d3eca5e865e8fb8e442d4 100644 (file)
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -143,8 +143,8 @@ Dispatcher::dispatch (SCM sev)
           assert (lists[0].prio > last_priority);
           last_priority = lists[0].prio;
 
-          Listener *l = Listener::unsmob (scm_cdar (lists[0].list));
-          l->listen (ev->self_scm ());
+          SCM l = scm_cdar (lists[0].list);
+          scm_call_1 (l, ev->self_scm ());
 #if 0
           sent = true;
 #endif

diff --git a/lily/include/listener.hh b/lily/include/listener.hh
index 959f7e510f1fa8b1c3a4d309b47b398756754f8e..3652a271b9b67dc66c60bbad3f2b48b1fb307653 100644 (file)
--- a/lily/include/listener.hh
+++ b/lily/include/listener.hh
@@ -86,6 +86,12 @@ public:
 
   void listen (SCM ev) const;
 
+  LY_DECLARE_SMOB_PROC (1, 0, 0, (SCM self, SCM ev))
+  {
+    Listener::unsmob (self)->listen (ev);
+    return SCM_UNSPECIFIED;
+  }
+
   bool operator == (Listener const &other) const
   {
     return type_ == other.type_