mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Use RAII for CFTypes

Browse source
This commit is contained in:
Tom Poole 2021-03-25 15:48:35 +00:00
parent 767f63dfb0
commit a9ad07a945
22 changed files with 344 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

71
modules/juce_audio_devices/native/juce_mac_CoreMidi.mm
View file

@ -414,10 +414,10 @@ namespace CoreMidiHelpers
MidiDeviceInfo info;
{
ScopedCFString str;
CFObjectHolder<CFStringRef> str;
if (CHECK_ERROR (MIDIObjectGetStringProperty (entity, kMIDIPropertyName, &str.cfString)))
info.name = String::fromCFString (str.cfString);
if (CHECK_ERROR (MIDIObjectGetStringProperty (entity, kMIDIPropertyName, &str.object)))
info.name = String::fromCFString (str.object);
}
SInt32 objectID = 0;
@ -428,10 +428,10 @@ namespace CoreMidiHelpers
}
else
{
ScopedCFString str;
CFObjectHolder<CFStringRef> str;
if (CHECK_ERROR (MIDIObjectGetStringProperty (entity, kMIDIPropertyUniqueID, &str.cfString)))
info.identifier = String::fromCFString (str.cfString);
if (CHECK_ERROR (MIDIObjectGetStringProperty (entity, kMIDIPropertyUniqueID, &str.object)))
info.identifier = String::fromCFString (str.object);
}
return info;
@ -486,18 +486,18 @@ namespace CoreMidiHelpers
MidiDeviceInfo result;
// Does the endpoint have connections?
CFDataRef connections = nullptr;
CFObjectHolder<CFDataRef> connections;
int numConnections = 0;
MIDIObjectGetDataProperty (endpoint, kMIDIPropertyConnectionUniqueID, &connections);
MIDIObjectGetDataProperty (endpoint, kMIDIPropertyConnectionUniqueID, &connections.object);
if (connections != nullptr)
if (connections.object != nullptr)
{
numConnections = ((int) CFDataGetLength (connections)) / (int) sizeof (MIDIUniqueID);
numConnections = ((int) CFDataGetLength (connections.object)) / (int) sizeof (MIDIUniqueID);
if (numConnections > 0)
{
auto* pid = reinterpret_cast<const SInt32*> (CFDataGetBytePtr (connections));
auto* pid = reinterpret_cast<const SInt32*> (CFDataGetBytePtr (connections.object));
for (int i = 0; i < numConnections; ++i, ++pid)
{
@ -533,8 +533,6 @@ namespace CoreMidiHelpers
}
}
}
CFRelease (connections);
}
// Here, either the endpoint had no connections, or we failed to obtain names for them.
@ -552,24 +550,15 @@ namespace CoreMidiHelpers
uniqueID = JUCE_STRINGIFY (JucePlugin_CFBundleIdentifier);
#else
auto appBundle = File::getSpecialLocation (File::currentApplicationFile);
ScopedCFString appBundlePath (appBundle.getFullPathName());
CFUniquePtr<CFStringRef> appBundlePath (appBundle.getFullPathName().toCFString());
if (auto bundleURL = CFURLCreateWithFileSystemPath (kCFAllocatorDefault,
appBundlePath.cfString,
kCFURLPOSIXPathStyle,
true))
{
auto bundleRef = CFBundleCreate (kCFAllocatorDefault, bundleURL);
CFRelease (bundleURL);
if (bundleRef != nullptr)
{
if (auto bundleId = CFBundleGetIdentifier (bundleRef))
if (auto bundleURL = CFUniquePtr<CFURLRef> (CFURLCreateWithFileSystemPath (kCFAllocatorDefault,
appBundlePath.get(),
kCFURLPOSIXPathStyle,
true)))
if (auto bundleRef = CFUniquePtr<CFBundleRef> (CFBundleCreate (kCFAllocatorDefault, bundleURL.get())))
if (auto bundleId = CFBundleGetIdentifier (bundleRef.get()))
uniqueID = String::fromCFString (bundleId);
CFRelease (bundleRef);
}
}
#endif
if (uniqueID.isEmpty())
@ -620,8 +609,8 @@ namespace CoreMidiHelpers
enableSimulatorMidiSession();
ScopedCFString name (getGlobalMidiClientName());
CHECK_ERROR (MIDIClientCreate (name.cfString, &globalSystemChangeCallback, nullptr, &globalMidiClient));
CFUniquePtr<CFStringRef> name (getGlobalMidiClientName().toCFString());
CHECK_ERROR (MIDIClientCreate (name.get(), &globalSystemChangeCallback, nullptr, &globalMidiClient));
}
return globalMidiClient;
@ -1058,16 +1047,16 @@ public:
if (deviceIdentifier != endpointInfo.identifier)
continue;
ScopedCFString cfName;
CFObjectHolder<CFStringRef> cfName;
if (! CHECK_ERROR (MIDIObjectGetStringProperty (endpoint, kMIDIPropertyName, &cfName.cfString)))
if (! CHECK_ERROR (MIDIObjectGetStringProperty (endpoint, kMIDIPropertyName, &cfName.object)))
continue;
if (auto input = makeInput (endpointInfo.name, endpointInfo.identifier, std::forward<Args> (args)...))
{
MIDIPortRef port;
if (! CHECK_ERROR (CreatorFunctionsToUse::createInputPort (protocol, client, cfName.cfString, input->internal.get(), &port)))
if (! CHECK_ERROR (CreatorFunctionsToUse::createInputPort (protocol, client, cfName.object, input->internal.get(), &port)))
continue;
ScopedPortRef scopedPort { port };
@ -1098,9 +1087,9 @@ public:
if (auto input = makeInput (deviceName, String (deviceIdentifier), std::forward<Args> (args)...))
{
MIDIEndpointRef endpoint;
ScopedCFString name (deviceName);
CFUniquePtr<CFStringRef> name (deviceName.toCFString());
auto err = CreatorFunctionsToUse::createDestination (protocol, client, name.cfString, input->internal.get(), &endpoint);
auto err = CreatorFunctionsToUse::createDestination (protocol, client, name.get(), input->internal.get(), &endpoint);
ScopedEndpointRef scopedEndpoint { endpoint };
#if JUCE_IOS
@ -1228,14 +1217,14 @@ std::unique_ptr<MidiOutput> MidiOutput::openDevice (const String& deviceIdentifi
if (deviceIdentifier != endpointInfo.identifier)
continue;
ScopedCFString cfName;
CFObjectHolder<CFStringRef> cfName;
if (! CHECK_ERROR (MIDIObjectGetStringProperty (endpoint, kMIDIPropertyName, &cfName.cfString)))
if (! CHECK_ERROR (MIDIObjectGetStringProperty (endpoint, kMIDIPropertyName, &cfName.object)))
continue;
MIDIPortRef port;
if (! CHECK_ERROR (MIDIOutputPortCreate (client, cfName.cfString, &port)))
if (! CHECK_ERROR (MIDIOutputPortCreate (client, cfName.object, &port)))
continue;
ScopedPortRef scopedPort { port };
@ -1258,9 +1247,9 @@ std::unique_ptr<MidiOutput> MidiOutput::createNewDevice (const String& deviceNam
{
MIDIEndpointRef endpoint;
ScopedCFString name (deviceName);
CFUniquePtr<CFStringRef> name (deviceName.toCFString());
auto err = CreatorFunctionsToUse::createSource (ump::PacketProtocol::MIDI_1_0, client, name.cfString, &endpoint);
auto err = CreatorFunctionsToUse::createSource (ump::PacketProtocol::MIDI_1_0, client, name.get(), &endpoint);
ScopedEndpointRef scopedEndpoint { endpoint };
#if JUCE_IOS