mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-08 04:20:09 +00:00
Code Activity

Fix deadlock in handleRouteChange for iOS audio.

Browse source
This commit is contained in:
tpoole 2016-08-23 17:45:21 +01:00
parent 6ba384f4c8
commit 881dfce40f
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/juce_audio_devices/native/juce_ios_Audio.cpp
View file

@ -438,6 +438,8 @@ public:
void handleStatusChange (bool enabled, const char* reason)
{
const ScopedLock myScopedLock (callbackLock);
JUCE_IOS_AUDIO_LOG ("handleStatusChange: enabled: " << (int) enabled << ", reason: " << reason);
isRunning = enabled;
@ -527,9 +529,9 @@ private:
if (audioInputIsAvailable && numInputChannels > 0)
err = AudioUnitRender (audioUnit, flags, time, 1, numFrames, data);
const ScopedLock sl (callbackLock);
const ScopedTryLock stl (callbackLock);
if (callback != nullptr)
if (stl.isLocked() && callback != nullptr)
{
if ((int) numFrames > floatData.getNumSamples())
prepareFloatBuffers ((int) numFrames);
@ -780,8 +782,24 @@ void AudioSessionHolder::handleStatusChange (bool enabled, const char* reason) c
void AudioSessionHolder::handleRouteChange (const char* reason) const
{
for (auto device: activeDevices)
device->handleRouteChange (reason);
struct RouteChangeMessage : public CallbackMessage
{
RouteChangeMessage (Array<iOSAudioIODevice*> devs, const char* r)
: devices (devs), changeReason (r)
{
}
void messageCallback() override
{
for (auto device: devices)
device->handleRouteChange (changeReason);
}
Array<iOSAudioIODevice*> devices;
const char* changeReason;
};
(new RouteChangeMessage (activeDevices, reason))->post();
}
#undef JUCE_NSERROR_CHECK