From e469806f669c66be418864dc0c95296bd79ea069 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 24 Aug 2015 13:13:16 +0100 Subject: [PATCH] Workaround for an obscure compiler error --- .../AU/CoreAudioUtilityClasses/AUBase.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUBase.cpp b/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUBase.cpp index 1572c3438b..5ba700f264 100644 --- a/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUBase.cpp +++ b/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/AUBase.cpp @@ -55,9 +55,6 @@ #include "CAVectorUnit.h" #include "CAXException.h" -// NB: This line added for JUCE, for backwards-compatibility with pre-10.8 frameworks -#define kAudioUnitProperty_NickName ((AudioUnitPropertyID) 54) - // This is for JUCE, added as a workaround for problems in older hosts following an API change. struct OldHostCallbackInfo { @@ -549,7 +546,7 @@ OSStatus AUBase::DispatchGetPropertyInfo(AudioUnitPropertyID inID, outWritable = false; break; - case kAudioUnitProperty_NickName: + case /*kAudioUnitProperty_NickName*/ 54: ca_require(inScope == kAudioUnitScope_Global, InvalidScope); outDataSize = sizeof(CFStringRef); outWritable = true; @@ -800,7 +797,7 @@ OSStatus AUBase::DispatchGetProperty( AudioUnitPropertyID inID, *(Float64*)outData = mCurrentRenderTime.mSampleTime; break; - case kAudioUnitProperty_NickName: + case /*kAudioUnitProperty_NickName*/ 54: // Ownership follows Core Foundation's 'Copy Rule' if (mNickName) CFRetain(mNickName); *(CFStringRef*)outData = mNickName; @@ -1015,7 +1012,7 @@ OSStatus AUBase::DispatchSetProperty( AudioUnitPropertyID inID, #endif // !CA_NO_AU_UI_FEATURES - case kAudioUnitProperty_NickName: + case /*kAudioUnitProperty_NickName*/ 54: { ca_require(inScope == kAudioUnitScope_Global, InvalidScope); ca_require(inDataSize == sizeof(CFStringRef), InvalidPropertyValue); @@ -1102,7 +1099,7 @@ OSStatus AUBase::DispatchRemovePropertyValue (AudioUnitPropertyID inID, #endif // !CA_NO_AU_UI_FEATURES - case kAudioUnitProperty_NickName: + case /*kAudioUnitProperty_NickName*/ 54: { if(inScope == kAudioUnitScope_Global) { if (mNickName) CFRelease(mNickName);