From 5515a6071f2ef0c24f133ce59e8e48164ae69ac1 Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 30 Nov 2007 13:26:43 +0000 Subject: [PATCH] Correct JackMachNotifyChannel::ClientNotify. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1719 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 7 ++++++- common/JackSocketNotifyChannel.cpp | 2 +- macosx/JackMachNotifyChannel.cpp | 10 ++++++---- macosx/Jackdmp.xcodeproj/project.pbxproj | 2 ++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6927f7cd..b4849e30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,12 @@ Kjetil S.Matheussen Jackdmp changes log --------------------------- -2007-11-28 Stephane Letz +2007-11-30 Stephane Letz + + * Correct JackMachNotifyChannel::ClientNotify. + +2007-11-29 Stephane Letz + * Correct fPeriodUsecs computation in JackAudioDriver::SetBufferSize and JackAudioDriver::SetSampleRate. 2007-11-28 Stephane Letz diff --git a/common/JackSocketNotifyChannel.cpp b/common/JackSocketNotifyChannel.cpp index c0c1a3fd..0a14394a 100644 --- a/common/JackSocketNotifyChannel.cpp +++ b/common/JackSocketNotifyChannel.cpp @@ -56,7 +56,7 @@ void JackSocketNotifyChannel::ClientNotify(int refnum, const char* name, int not jack_error("Could not write notification"); fNotifySocket.Close(); *result = -1; - return ; + return; } // Read the result in "synchronous" mode only diff --git a/macosx/JackMachNotifyChannel.cpp b/macosx/JackMachNotifyChannel.cpp index 68b686e9..bc493123 100644 --- a/macosx/JackMachNotifyChannel.cpp +++ b/macosx/JackMachNotifyChannel.cpp @@ -50,13 +50,15 @@ void JackMachNotifyChannel::Close() void JackMachNotifyChannel::ClientNotify(int refnum, const char* name, int notify, int sync, int value, int* result) { - *result = 0; kern_return_t res = (sync) ? rpc_jack_client_sync_notify(fClientPort.GetPort(), refnum, (char*)name, notify, value, result) : rpc_jack_client_async_notify(fClientPort.GetPort(), refnum, (char*)name, notify, value); - if (res != KERN_SUCCESS) { - jack_error("JackMachNotifyChannel::ClientNotify: name = %s notify = %ld err = %s", name, notify, mach_error_string(res)); - } + if (res == KERN_SUCCESS) { + *result = 0; + } else { + jack_error("JackMachNotifyChannel::ClientNotify: name = %s notify = %ld err = %s", name, notify, mach_error_string(res)); + *result = -1; + } } } // end of namespace diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index e177acdb..ba5e83f0 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -3299,6 +3299,7 @@ ppc, ); COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3464,6 +3465,7 @@ i386, ); COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1;