From 05216197b491d64036733a2d3be511456c1f65cd Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 19 Jul 2015 18:49:06 +0200 Subject: [PATCH] Make JackPortRenameCallback return void, to match JACK1 API JACK2 added this function first, but the int return has been always wrong. When JACK1 added JackPortRenameCallback it used the proper return. Now that JACK1 supports port renames, devs will start to use it. (previously it didn't work properly because of the missing jack_client_t* arg) Some code might be broken because of this, but it's a very simple change, and existing code would have been broken when changing JACK1 to JACK2. Finally, JACK2 code never uses the int return value of this callback. So there's no real reason to NOT change this. --- common/jack/types.h | 4 +--- tests/test.cpp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/jack/types.h b/common/jack/types.h index 094d4074..2dccf34f 100644 --- a/common/jack/types.h +++ b/common/jack/types.h @@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int * @param port the port that has been renamed * @param new_name the new name * @param arg pointer to a client supplied structure - * - * @return zero on success, non-zero on error */ -typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); +typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg); /** * Prototype for the client supplied function that is called diff --git a/tests/test.cpp b/tests/test.cpp index 750d152c..8a8a8117 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg) client_register--; } -int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) +void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg) { Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name); port_rename_clbk = 1; - return 0; } int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)