Merge branch 'doc-hu' into translation

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

diff --git a/lily/dispatcher-scheme.cc b/lily/dispatcher-scheme.cc
index 1a04b3c37ca09d6947bcfc905c43c45eec01a10d..61674b3c756440af8a6c2444999d232e005f76af 100644 (file)
--- a/lily/dispatcher-scheme.cc
+++ b/lily/dispatcher-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2014 Erik Sandberg  <mandolaerik@gmail.com>
+  Copyright (C) 2006--2015 Erik Sandberg  <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,22 +42,21 @@ LY_DEFINE (ly_connect_dispatchers, "ly:connect-dispatchers",
 }
 
 LY_DEFINE (ly_add_listener, "ly:add-listener",
-           2, 0, 1, (SCM list, SCM disp, SCM cl),
-           "Add the listener @var{list} to the dispatcher @var{disp}."
-           "  Whenever @var{disp} hears an event of class @var{cl},"
-           " it is forwarded to @var{list}.")
+           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.")
 {
-  Listener *l = Listener::unsmob (list);
   Dispatcher *d = Dispatcher::unsmob (disp);
 
-  LY_ASSERT_SMOB (Listener, list, 1);
+  LY_ASSERT_TYPE (ly_is_procedure, callback, 1);
   LY_ASSERT_SMOB (Dispatcher, disp, 2);
 
   for (int arg = SCM_ARG3; scm_is_pair (cl); cl = scm_cdr (cl), arg++)
     {
       SCM sym = scm_car (cl);
       SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, arg, __FUNCTION__, "symbol");
-      d->add_listener (*l, sym);
+      d->add_listener (callback, sym);
     }
 
   return SCM_UNSPECIFIED;
@@ -97,7 +96,7 @@ LY_DEFINE (ly_broadcast, "ly:broadcast",
            "Send the stream event @var{ev} to the dispatcher @var{disp}.")
 {
   Dispatcher *d = Dispatcher::unsmob (disp);
-  Stream_event *e = unsmob_stream_event (ev);
+  Stream_event *e = Stream_event::unsmob (ev);
 
   LY_ASSERT_SMOB (Dispatcher, disp, 1);