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

Minor OSX midi tweak.

Browse source
This commit is contained in:
jules 2012-05-22 14:58:06 +01:00
parent 9a56a2f8ba
commit 1dd3774af3
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/juce_audio_devices/native/juce_mac_CoreMidi.cpp
View file

@ -149,19 +149,14 @@ namespace CoreMidiHelpers
CFRelease (connections);
}
if (result.isNotEmpty())
return result;
if (result.isEmpty()) // Here, either the endpoint had no connections, or we failed to obtain names for them.
result = getEndpointName (endpoint, false);
// Here, either the endpoint had no connections, or we failed to obtain names for any of them.
return getEndpointName (endpoint, false);
return result;
}
static StringArray findDevices (const bool forInput)
{
// Since OSX 10.6, the CoreMidi functions that fetch the list of midi
// devices only work correctly when called from the message thread!
jassert (MessageManager::getInstance()->isThisTheMessageThread());
const ItemCount num = forInput ? MIDIGetNumberOfSources()
: MIDIGetNumberOfDestinations();
StringArray s;
@ -184,20 +179,30 @@ namespace CoreMidiHelpers
return s;
}
static void globalSystemChangeCallback (const MIDINotification*, void*)
{
// TODO.. Should pass-on this notification..
}
static String getGlobalMidiClientName()
{
JUCEApplicationBase* const app = JUCEApplicationBase::getInstance();
return app != nullptr ? app->getApplicationName() : "JUCE";
}
static MIDIClientRef getGlobalMidiClient()
{
static MIDIClientRef globalMidiClient = 0;
if (globalMidiClient == 0)
{
String name ("JUCE");
// Since OSX 10.6, the MIDIClientCreate function will only work
// correctly when called from the message thread!
jassert (MessageManager::getInstance()->isThisTheMessageThread());
if (JUCEApplicationBase::getInstance() != nullptr)
name = JUCEApplicationBase::getInstance()->getApplicationName();
CFStringRef appName = name.toCFString();
CHECK_ERROR (MIDIClientCreate (appName, 0, 0, &globalMidiClient));
CFRelease (appName);
CFStringRef name = getGlobalMidiClientName().toCFString();
CHECK_ERROR (MIDIClientCreate (name, &globalSystemChangeCallback, 0, &globalMidiClient));
CFRelease (name);
}
return globalMidiClient;