X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-control-function-performer.cc;h=90ea063f736d1c3af3a884ba7cc5858506d1ff7e;hb=ca848f7df661cdaf710b3293a2a81bf20c41e3ef;hp=0a02668c305a724f787095e2ba9ce8639a52c471;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/midi-control-function-performer.cc b/lily/midi-control-function-performer.cc
index 0a02668c30..90ea063f73 100644
--- a/lily/midi-control-function-performer.cc
+++ b/lily/midi-control-function-performer.cc
@@ -39,7 +39,7 @@ class Midi_control_function_performer : public Performer
 {
 public:
   TRANSLATOR_DECLARATIONS (Midi_control_function_performer);
-  DECLARE_LISTENER (announce_function_value_change);
+  void announce_function_value_change (SCM);
   ~Midi_control_function_performer ();
 
   void connect_to_context (Context *c);
@@ -58,7 +58,7 @@ void
 Midi_control_function_performer::connect_to_context (Context *c)
 {
   c->events_below ()->
-    add_listener (GET_LISTENER (announce_function_value_change),
+    add_listener (GET_LISTENER (Midi_control_function_performer, announce_function_value_change),
                   ly_symbol2scm ("SetProperty"));
 }
 
@@ -66,16 +66,14 @@ void
 Midi_control_function_performer::disconnect_from_context (Context *c)
 {
   c->events_below ()->
-    remove_listener (GET_LISTENER (announce_function_value_change),
+    remove_listener (GET_LISTENER (Midi_control_function_performer, announce_function_value_change),
                      ly_symbol2scm ("SetProperty"));
 }
 
-IMPLEMENT_LISTENER (Midi_control_function_performer,
-                    announce_function_value_change)
 void
 Midi_control_function_performer::announce_function_value_change (SCM sev)
 {
-  Stream_event *ev = Stream_event::unsmob (sev);
+  Stream_event *ev = unsmob<Stream_event> (sev);
   SCM sym = ev->get_property ("symbol");
   if (!scm_is_symbol (sym))
     return;