Release: bump Welcome versions.

[lilypond.git] / lily / dispatcher-scheme.cc

diff --git a/lily/dispatcher-scheme.cc b/lily/dispatcher-scheme.cc
index 61674b3c756440af8a6c2444999d232e005f76af..3fd4decc42b28640ce77f2a76d7ca968e7d909ec 100644 (file)
--- a/lily/dispatcher-scheme.cc
+++ b/lily/dispatcher-scheme.cc
@@ -30,8 +30,8 @@ LY_DEFINE (ly_connect_dispatchers, "ly:connect-dispatchers",
            2, 0, 0, (SCM to, SCM from),
            "Make the dispatcher @var{to} listen to events from @var{from}.")
 {
-  Dispatcher *t = Dispatcher::unsmob (to);
-  Dispatcher *f = Dispatcher::unsmob (from);
+  Dispatcher *t = unsmob<Dispatcher> (to);
+  Dispatcher *f = unsmob<Dispatcher> (from);
 
   LY_ASSERT_SMOB (Dispatcher, to, 1);
   LY_ASSERT_SMOB (Dispatcher, from, 2);
@@ -41,13 +41,28 @@ LY_DEFINE (ly_connect_dispatchers, "ly:connect-dispatchers",
   return SCM_UNSPECIFIED;
 }
 
+LY_DEFINE (ly_disconnect_dispatchers, "ly:disconnect-dispatchers",
+           2, 0, 0, (SCM to, SCM from),
+           "Stop the dispatcher @var{to} listening to events from @var{from}.")
+{
+  Dispatcher *t = unsmob<Dispatcher> (to);
+  Dispatcher *f = unsmob<Dispatcher> (from);
+
+  LY_ASSERT_SMOB (Dispatcher, to, 1);
+  LY_ASSERT_SMOB (Dispatcher, from, 2);
+
+  t->unregister_as_listener (f);
+
+  return SCM_UNSPECIFIED;
+}
+
 LY_DEFINE (ly_add_listener, "ly:add-listener",
            2, 0, 1, (SCM callback, SCM disp, SCM cl),
            "Add the single-argument procedure @var{callback} as listener"
            " to the dispatcher @var{disp}.  Whenever @var{disp} hears"
            " an event of class @var{cl}, it calls @var{callback} with it.")
 {
-  Dispatcher *d = Dispatcher::unsmob (disp);
+  Dispatcher *d = unsmob<Dispatcher> (disp);
 
   LY_ASSERT_TYPE (ly_is_procedure, callback, 1);
   LY_ASSERT_SMOB (Dispatcher, disp, 2);
@@ -69,7 +84,7 @@ LY_DEFINE (ly_listened_event_types, "ly:listened-event-types",
 {
   LY_ASSERT_SMOB (Dispatcher, disp, 1);
 
-  SCM result = Dispatcher::unsmob (disp)->listened_types ();
+  SCM result = unsmob<Dispatcher> (disp)->listened_types ();
 
   scm_remember_upto_here_1 (disp);
 
@@ -84,7 +99,7 @@ LY_DEFINE (ly_listened_event_class_p, "ly:listened-event-class?",
   LY_ASSERT_SMOB (Dispatcher, disp, 1);
   LY_ASSERT_TYPE (scm_is_pair, cl, 2);
 
-  bool result = Dispatcher::unsmob (disp)->is_listened_class (cl);
+  bool result = unsmob<Dispatcher> (disp)->is_listened_class (cl);
 
   scm_remember_upto_here_1 (disp);
 
@@ -95,8 +110,8 @@ LY_DEFINE (ly_broadcast, "ly:broadcast",
            2, 0, 0, (SCM disp, SCM ev),
            "Send the stream event @var{ev} to the dispatcher @var{disp}.")
 {
-  Dispatcher *d = Dispatcher::unsmob (disp);
-  Stream_event *e = Stream_event::unsmob (ev);
+  Dispatcher *d = unsmob<Dispatcher> (disp);
+  Stream_event *e = unsmob<Stream_event> (ev);
 
   LY_ASSERT_SMOB (Dispatcher, disp, 1);