summaryrefslogtreecommitdiff
path: root/common/JackClient.cpp
diff options
context:
space:
mode:
authorStephane Letz <letz@grame.fr>2013-04-22 19:09:23 +0200
committerStephane Letz <letz@grame.fr>2013-04-22 19:09:23 +0200
commita4e319b753daf2e16f5bf60da4c03c6be3f496de (patch)
tree4c2653f790174a2436cc88a3d35d36425534a5ea /common/JackClient.cpp
parent1fe67998034dd49e2b5bc1408ccc359cb7b2b727 (diff)
downloadjack2-a4e319b753daf2e16f5bf60da4c03c6be3f496de.tar.gz
Correctly pass code parameter in InfoShutdown callback.
Diffstat (limited to 'common/JackClient.cpp')
-rw-r--r--common/JackClient.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/JackClient.cpp b/common/JackClient.cpp
index 8a9835e9..6460dfac 100644
--- a/common/JackClient.cpp
+++ b/common/JackClient.cpp
@@ -88,13 +88,13 @@ JackClient::JackClient(JackSynchro* table):fThread(this)
JackClient::~JackClient()
{}
-void JackClient::ShutDown(const char* message)
+void JackClient::ShutDown(jack_status_t code, const char* message)
{
jack_log("JackClient::ShutDown");
// If "fInfoShutdown" callback, then call it
if (fInfoShutdown) {
- fInfoShutdown(JackFailure, message, fInfoShutdownArg);
+ fInfoShutdown(code, message, fInfoShutdownArg);
fInfoShutdown = NULL;
// Otherwise possibly call the normal "fShutdown"
} else if (fShutdown) {
@@ -299,7 +299,7 @@ int JackClient::ClientNotify(int refnum, const char* name, int notify, int sync,
case kShutDownCallback:
jack_log("JackClient::kShutDownCallback");
- ShutDown(message);
+ ShutDown(jack_status_t(value1), message);
break;
case kSessionCallback:
@@ -660,7 +660,7 @@ inline void JackClient::Error()
fThread.DropSelfRealTime();
GetClientControl()->fActive = false;
fChannel->ClientDeactivate(GetClientControl()->fRefNum, &result);
- ShutDown(JACK_SERVER_FAILURE);
+ ShutDown(jack_status_t(JackFailure | JackServerError), JACK_SERVER_FAILURE);
fThread.Terminate();
}