oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

apple/AudioObject: add AudioObjectGetStringProperty()

Browse Source
This commit is contained in:
Max Kellermann
2020-07-02 13:37:44 +02:00
parent 756f0b8027
commit db8bf52f7d
4 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/output/plugins/OSXOutputPlugin.cxx
View File

@@ -535,19 +535,15 @@ IsAudioDeviceName(AudioDeviceID id, const char *expected_name) noexcept
kAudioObjectPropertyElementMaster,
};
CFStringRef cfname;
UInt32 size = sizeof(cfname);
if (AudioObjectGetPropertyData(id, &aopa_name,
0, nullptr,
&size, &cfname) != noErr)
return false;
const Apple::StringRef cfname_(cfname);
char actual_name[256];
if (!cfname_.GetCString(actual_name, sizeof(actual_name)))
try {
auto cfname = AudioObjectGetStringProperty(id, aopa_name);
if (!cfname.GetCString(actual_name, sizeof(actual_name)))
return false;
} catch (...) {
return false;
}
return StringIsEqual(actual_name, expected_name);
}