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

CoreAudio: Better handling of background device changes

Browse source
This commit is contained in:
Tom Poole 2018-01-03 12:18:59 +00:00
parent e7a5e520c6
commit 0638daf9a8
1 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

57
modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
View file

@ -1068,7 +1068,10 @@ public:
isStarted = internal->start();
if (isStarted)
{
internal->setCallback (callback);
previousCallback = callback;
}
}
}
@ -1117,7 +1120,9 @@ public:
if (isStarted)
{
previousCallback = internal->callback;
if (internal->callback != nullptr)
previousCallback = internal->callback;
stop();
}
}
@ -1155,8 +1160,11 @@ private:
stopTimer();
stop();
internal->updateDetailsFromDevice();
open (inputChannelsRequested, outputChannelsRequested,
sampleRateRequested, bufferSizeSamplesRequested);
getCurrentSampleRate(), getCurrentBufferSizeSamples());
start (previousCallback);
}
@ -1396,8 +1404,45 @@ public:
const ScopedLock sl (closeLock);
close();
auto newSampleRate = sampleRateRequested;
auto newBufferSize = bufferSizeRequested;
for (auto* d : devices)
{
auto deviceSampleRate = d->getCurrentSampleRate();
if (deviceSampleRate != sampleRateRequested)
{
if (! getAvailableSampleRates().contains (deviceSampleRate))
return;
for (auto* d2 : devices)
if (d2 != d)
d2->setCurrentSampleRate (deviceSampleRate);
newSampleRate = deviceSampleRate;
break;
}
}
for (auto* d : devices)
{
auto deviceBufferSize = d->getCurrentBufferSizeSamples();
if (deviceBufferSize != bufferSizeRequested)
{
if (! getAvailableBufferSizes().contains (deviceBufferSize))
return;
newBufferSize = deviceBufferSize;
break;
}
}
open (inputChannelsRequested, outputChannelsRequested,
sampleRateRequested, bufferSizeRequested);
newSampleRate, newBufferSize);
start (cb);
}
@ -1408,7 +1453,9 @@ public:
if (active)
{
previousCallback = callback;
if (callback != nullptr)
previousCallback = callback;
close();
}
}
@ -1489,6 +1536,7 @@ public:
const ScopedLock sl (callbackLock);
callback = newCallback;
previousCallback = callback;
}
}
@ -1917,6 +1965,7 @@ private:
double getCurrentSampleRate() { return device->getCurrentSampleRate(); }
bool setCurrentSampleRate (double newSampleRate) { return device->setCurrentSampleRate (newSampleRate); }
int getCurrentBufferSizeSamples() { return device->getCurrentBufferSizeSamples(); }
void audioDeviceAboutToStart (AudioIODevice* d) override { owner.handleAudioDeviceAboutToStart (d); }
void audioDeviceStopped() override { owner.handleAudioDeviceStopped(); }