Skip to content

Updated setState on AU to allow arbitrary key-value pairs on macOS #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TheOnlyJoey wants to merge 2 commits into from
Closed

Updated setState on AU to allow arbitrary key-value pairs on macOS #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
870ac0b
Updated setState on AU components to allow arbitrary key-value pairs …
TheOnlyJoey Apr 2, 2025
44278ab
Forgot to remove include from testing
TheOnlyJoey Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions distrho/src/DistrhoPluginAU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,25 +1651,23 @@ class PluginAU
#if DISTRHO_PLUGIN_WANT_STATE
DISTRHO_SAFE_ASSERT_UINT_RETURN(inElement < fStateCount, inElement, kAudioUnitErr_InvalidElement);
{
const CFStringRef valueRef = *static_cast<const CFStringRef*>(inData);
DISTRHO_SAFE_ASSERT_RETURN(valueRef != nullptr && CFGetTypeID(valueRef) == CFStringGetTypeID(),
const CFDictionaryRef dictRef = *static_cast<const CFDictionaryRef*>(inData);
DISTRHO_SAFE_ASSERT_RETURN(dictRef != nullptr && CFGetTypeID(dictRef) == CFDictionaryGetTypeID(),
kAudioUnitErr_InvalidPropertyValue);
const void * keyArr;
const void * valueArr;
CFDictionaryGetKeysAndValues(dictRef, &keyArr, &valueArr);

const CFIndex valueLen = CFStringGetLength(valueRef);
char* const value = static_cast<char*>(std::malloc(valueLen + 1));
DISTRHO_SAFE_ASSERT_RETURN(value != nullptr, kAudio_ParamError);
DISTRHO_SAFE_ASSERT_RETURN(CFStringGetCString(valueRef, value, valueLen + 1, kCFStringEncodingUTF8),
kAudioUnitErr_InvalidPropertyValue);
const char* cKey = [keyArr UTF8String];
const char* cValue = [valueArr UTF8String];

const String& key(fPlugin.getStateKey(inElement));
const String stringKey(cKey);

// save this key as needed
if (fPlugin.wantStateKey(key))
fStateMap[key] = value;

fPlugin.setState(key, value);
if (fPlugin.wantStateKey(stringKey))
fStateMap[stringKey] = cValue;

std::free(value);
fPlugin.setState(stringKey, cValue);
}
return noErr;
#else
Expand Down
23 changes: 16 additions & 7 deletions distrho/src/DistrhoUIAU.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,23 @@ static void setParameterCallback(void* const ptr, const uint32_t rindex, const f
#if DISTRHO_PLUGIN_WANT_STATE
void setState(const char* const key, const char* const value)
{
const std::vector<String>::iterator it = std::find(fStateKeys.begin(), fStateKeys.end(), key);
DISTRHO_SAFE_ASSERT_RETURN(it != fStateKeys.end(),);

if (const CFStringRef valueRef = CFStringCreateWithCString(nullptr, value, kCFStringEncodingUTF8))
if (const CFStringRef keyRef = CFStringCreateWithCString((CFAllocatorRef )NULL,key,kCFStringEncodingUTF8))
{
const uint32_t index = it - fStateKeys.begin();
AudioUnitSetProperty(fComponent, 'DPFs', kAudioUnitScope_Global, index, &valueRef, sizeof(CFStringRef));
CFRelease(valueRef);
if (const CFStringRef valueRef = CFStringCreateWithCString(( CFAllocatorRef )NULL,
value,kCFStringEncodingUTF8))
{
CFTypeRef keyArrayRef[1] = {keyRef};
CFTypeRef valueArrayRef[1] = {valueRef};

CFDictionaryRef dictRef = CFDictionaryCreate((CFAllocatorRef)NULL,( const void ** )keyArrayRef,
( const void ** )valueArrayRef, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

AudioUnitSetProperty(fComponent, 'DPFs', kAudioUnitScope_Global, 0, &dictRef, sizeof(dictRef));

CFRelease(keyRef);
CFRelease(valueRef);
CFRelease(dictRef);
}
}
}

Expand Down