From 92c8fa6dee7c62e35178c2412830284ac5cffd7c Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 11 Nov 2009 09:59:08 +0000 Subject: [PATCH] Sync info shutdown callback code with jack1 one. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3734 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/jack/types.h | 4 ++-- macosx/coreaudio/JackCoreAudioDriver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/jack/types.h b/common/jack/types.h index 347692fe..fd71ceac 100644 --- a/common/jack/types.h +++ b/common/jack/types.h @@ -422,9 +422,9 @@ enum JackStatus { JackVersionError = 0x400, /** - * Client process failure + * Backend error */ - JackClientProcessFailure = 0x800, + JackBackendError = 0x800, /** * Client zombified failure diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp index a5eaa5d5..c62429ec 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.cpp +++ b/macosx/coreaudio/JackCoreAudioDriver.cpp @@ -289,7 +289,7 @@ OSStatus JackCoreAudioDriver::DeviceNotificationCallback(AudioDeviceID inDevice, case kAudioDevicePropertyStreamConfiguration: { jack_error("Cannot handle kAudioDevicePropertyStreamConfiguration : server will quit..."); - driver->NotifyFailure(JackClientProcessFailure, "Another application has changed the device configuration."); // Message length limited to JACK_MESSAGE_SIZE + driver->NotifyFailure(JackBackendError, "Another application has changed the device configuration."); // Message length limited to JACK_MESSAGE_SIZE driver->CloseAUHAL(); kill(JackTools::GetPID(), SIGINT); return kAudioHardwareUnsupportedOperationError; @@ -297,7 +297,7 @@ OSStatus JackCoreAudioDriver::DeviceNotificationCallback(AudioDeviceID inDevice, case kAudioDevicePropertyNominalSampleRate: { jack_error("Cannot handle kAudioDevicePropertyNominalSampleRate : server will quit..."); - driver->NotifyFailure(JackClientProcessFailure, "Another application has changed the sample rate."); // Message length limited to JACK_MESSAGE_SIZE + driver->NotifyFailure(JackBackendError, "Another application has changed the sample rate."); // Message length limited to JACK_MESSAGE_SIZE driver->CloseAUHAL(); kill(JackTools::GetPID(), SIGINT); return kAudioHardwareUnsupportedOperationError;