From 0ed2dbe4ff8ed7e89cbddf7912d851b24be169c4 Mon Sep 17 00:00:00 2001 From: petern Date: Wed, 2 Dec 2009 08:23:28 +0000 Subject: [PATCH] Update to jack2's new "improved" port rename callback git-svn-id: file:///home/vcs/svn/jsweeper/trunk@25 6611ac79-6612-48ef-a1e9-b906f853523e --- src/jack.cpp | 2 +- src/jack.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jack.cpp b/src/jack.cpp index 941e801..87a9099 100644 --- a/src/jack.cpp +++ b/src/jack.cpp @@ -99,7 +99,7 @@ void JackDriver::PortConnectCallback(jack_port_id_t port_id_a, jack_port_id_t po } } -int JackDriver::PortRenameCallback(jack_port_id_t port_id, const char * /*name*/) +int JackDriver::PortRenameCallback(jack_port_id_t port_id) { PortEvent pe; pe.type = PET_RENAME; diff --git a/src/jack.h b/src/jack.h index 566e6dd..95da3b5 100644 --- a/src/jack.h +++ b/src/jack.h @@ -43,15 +43,15 @@ private: ((JackDriver *)arg)->PortConnectCallback(port_id_a, port_id_b, connect); } - static int PortRenameCallbackHandler(jack_port_id_t port_id, const char *name, void *arg) + static int PortRenameCallbackHandler(jack_port_id_t port_id, const char * /*old_name*/, const char * /*new_name*/, void *arg) { - return ((JackDriver *)arg)->PortRenameCallback(port_id, name); + return ((JackDriver *)arg)->PortRenameCallback(port_id); } void ShutdownCallback(); void PortRegistrationCallback(jack_port_id_t port, int reg); void PortConnectCallback(jack_port_id_t a, jack_port_id_t b, int connect); - int PortRenameCallback(jack_port_id_t port_id, const char *name); + int PortRenameCallback(jack_port_id_t port_id); public: JackDriver();