git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2905 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.90
@@ -201,7 +201,7 @@ int JackLoadableInternalClient::Init(const char* so_name) | |||||
int JackLoadableInternalClient1::Init(const char* so_name) | int JackLoadableInternalClient1::Init(const char* so_name) | ||||
{ | { | ||||
if (JackLoadableInternalClient::Init(so_name) < 0) { | if (JackLoadableInternalClient::Init(so_name) < 0) { | ||||
return -1; | |||||
return -1; | |||||
} | } | ||||
fInitialize = (InitializeCallback)GetJackProc(fHandle, "jack_initialize"); | fInitialize = (InitializeCallback)GetJackProc(fHandle, "jack_initialize"); | ||||
@@ -217,7 +217,7 @@ int JackLoadableInternalClient1::Init(const char* so_name) | |||||
int JackLoadableInternalClient2::Init(const char* so_name) | int JackLoadableInternalClient2::Init(const char* so_name) | ||||
{ | { | ||||
if (JackLoadableInternalClient::Init(so_name) < 0) { | if (JackLoadableInternalClient::Init(so_name) < 0) { | ||||
return -1; | |||||
return -1; | |||||
} | } | ||||
fInitialize = (InternalInitializeCallback)GetJackProc(fHandle, "jack_internal_initialize"); | fInitialize = (InternalInitializeCallback)GetJackProc(fHandle, "jack_internal_initialize"); | ||||
@@ -160,7 +160,7 @@ int JackServer::InternalClientLoad(const char* client_name, const char* so_name, | |||||
int my_status1 = *status | JackFailure; | int my_status1 = *status | JackFailure; | ||||
*status = (jack_status_t)my_status1; | *status = (jack_status_t)my_status1; | ||||
*int_ref = 0; | *int_ref = 0; | ||||
return -1; | |||||
return -1; | |||||
} | } | ||||
return InternalClientLoadAux(client, client_name, options, int_ref, status); | return InternalClientLoadAux(client, client_name, options, int_ref, status); | ||||
@@ -172,10 +172,10 @@ int JackServer::InternalClientLoad(const char* client_name, const char* so_name, | |||||
assert(client); | assert(client); | ||||
if (client->Init(so_name) < 0) { | if (client->Init(so_name) < 0) { | ||||
int my_status1 = *status | JackFailure; | |||||
int my_status1 = *status | JackFailure; | |||||
*status = (jack_status_t)my_status1; | *status = (jack_status_t)my_status1; | ||||
*int_ref = 0; | *int_ref = 0; | ||||
return -1; | |||||
return -1; | |||||
} | } | ||||
return InternalClientLoadAux(client, client_name, options, int_ref, status); | return InternalClientLoadAux(client, client_name, options, int_ref, status); | ||||
@@ -925,6 +925,7 @@ int JackCoreAudioAdapter::Close() | |||||
AudioOutputUnitStop(fAUHAL); | AudioOutputUnitStop(fAUHAL); | ||||
DisposeBuffers(); | DisposeBuffers(); | ||||
CloseAUHAL(); | CloseAUHAL(); | ||||
RemoveListeners(); | |||||
return 0; | return 0; | ||||
} | } | ||||