diff options
| author | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2008-09-10 13:34:14 +0000 |
|---|---|---|
| committer | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | 2008-09-10 13:34:14 +0000 |
| commit | 34bb208d1ef2318377b95e2829df7d52bd9eee45 (patch) | |
| tree | fab18acc5ed7b51ef6209466999c8775fb1a646d | |
| parent | 9d0aa7e864d91836476582e44c5e5a9f1c81906e (diff) | |
| download | jack2-34bb208d1ef2318377b95e2829df7d52bd9eee45.tar.gz | |
Correct JackCoreAudioAdapter::Close.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2905 0c269be4-1314-0410-8aa9-9f06e86f4224
| -rw-r--r-- | common/JackInternalClient.cpp | 4 | ||||
| -rw-r--r-- | common/JackServer.cpp | 6 | ||||
| -rw-r--r-- | macosx/coreaudio/JackCoreAudioAdapter.cpp | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp index 512e1713..b6f777d3 100644 --- a/common/JackInternalClient.cpp +++ b/common/JackInternalClient.cpp @@ -201,7 +201,7 @@ int JackLoadableInternalClient::Init(const char* so_name) int JackLoadableInternalClient1::Init(const char* so_name) { if (JackLoadableInternalClient::Init(so_name) < 0) { - return -1; + return -1; } fInitialize = (InitializeCallback)GetJackProc(fHandle, "jack_initialize"); @@ -217,7 +217,7 @@ int JackLoadableInternalClient1::Init(const char* so_name) int JackLoadableInternalClient2::Init(const char* so_name) { if (JackLoadableInternalClient::Init(so_name) < 0) { - return -1; + return -1; } fInitialize = (InternalInitializeCallback)GetJackProc(fHandle, "jack_internal_initialize"); diff --git a/common/JackServer.cpp b/common/JackServer.cpp index 23bbc9b1..60b79b42 100644 --- a/common/JackServer.cpp +++ b/common/JackServer.cpp @@ -160,7 +160,7 @@ int JackServer::InternalClientLoad(const char* client_name, const char* so_name, int my_status1 = *status | JackFailure; *status = (jack_status_t)my_status1; *int_ref = 0; - return -1; + return -1; } 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); if (client->Init(so_name) < 0) { - int my_status1 = *status | JackFailure; + int my_status1 = *status | JackFailure; *status = (jack_status_t)my_status1; *int_ref = 0; - return -1; + return -1; } return InternalClientLoadAux(client, client_name, options, int_ref, status); diff --git a/macosx/coreaudio/JackCoreAudioAdapter.cpp b/macosx/coreaudio/JackCoreAudioAdapter.cpp index 45c55009..4746e99e 100644 --- a/macosx/coreaudio/JackCoreAudioAdapter.cpp +++ b/macosx/coreaudio/JackCoreAudioAdapter.cpp @@ -925,6 +925,7 @@ int JackCoreAudioAdapter::Close() AudioOutputUnitStop(fAUHAL); DisposeBuffers(); CloseAUHAL(); + RemoveListeners(); return 0; } |