diff --git a/ChangeLog b/ChangeLog index 77a5edd3..0ccfb574 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,10 @@ Chris Caudle Jackdmp changes log --------------------------- +2011-07-23 Stephane Letz + + * Possible fix for http://trac.jackaudio.org/ticket/193. + 2011-07-22 Stephane Letz * NetJack2: improve error reporting. diff --git a/common/JackChannel.h b/common/JackChannel.h index bb79d456..5979ba8e 100644 --- a/common/JackChannel.h +++ b/common/JackChannel.h @@ -74,7 +74,7 @@ class JackClientChannelInterface return -1; } - virtual void ClientCheck(const char* name, int uuid, char* name_res, int protocol, int options, int* status, int* result, int open = false) + virtual void ClientCheck(const char* name, int uuid, char* name_res, int protocol, int options, int* status, int* result, int open) {} virtual void ClientOpen(const char* name, int pid, int uuid, int* shared_engine, int* shared_client, int* shared_graph, int* result) {} diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp index fc2e9a7f..0882d5ad 100644 --- a/common/JackInternalClient.cpp +++ b/common/JackInternalClient.cpp @@ -71,7 +71,7 @@ int JackInternalClient::Open(const char* server_name, const char* name, int uuid strncpy(fServerName, server_name, sizeof(fServerName)); - fChannel->ClientCheck(name, uuid, name_res, JACK_PROTOCOL_VERSION, (int)options, (int*)status, &result); + fChannel->ClientCheck(name, uuid, name_res, JACK_PROTOCOL_VERSION, (int)options, (int*)status, &result, false); if (result < 0) { int status1 = *status; if (status1 & JackVersionError) { diff --git a/common/JackInternalClientChannel.h b/common/JackInternalClientChannel.h index dc81ac8c..eb986ae4 100644 --- a/common/JackInternalClientChannel.h +++ b/common/JackInternalClientChannel.h @@ -50,7 +50,7 @@ class JackInternalClientChannel : public detail::JackClientChannelInterface return 0; } - void ClientCheck(const char* name, int uuid, char* name_res, int protocol, int options, int* status, int* result) + void ClientCheck(const char* name, int uuid, char* name_res, int protocol, int options, int* status, int* result, int open) { *result = fEngine->ClientCheck(name, uuid, name_res, protocol, options, status); }