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: Fix a bug when retrieving the index of a device nested inside an AudioIODeviceCombiner

Browse source
This commit is contained in:
Anthony Nicholls 2023-11-09 15:21:57 +00:00
parent d054f0d14d
commit e8d221ccb3
1 changed files with 13 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

62
modules/juce_audio_devices/native/juce_CoreAudio_mac.cpp
View file

@ -1462,6 +1462,12 @@ public:
auto getDeviceWrappers() { return std::array< DeviceWrapper*, 2> { { &inputWrapper, &outputWrapper } }; }
auto getDeviceWrappers() const { return std::array<const DeviceWrapper*, 2> { { &inputWrapper, &outputWrapper } }; }
int getIndexOfDevice (bool asInput) const
{
return asInput ? inputWrapper.getIndexOfDevice (true)
: outputWrapper.getIndexOfDevice (false);
}
StringArray getOutputChannelNames() override { return outputWrapper.getChannelNames(); }
StringArray getInputChannelNames() override { return inputWrapper .getChannelNames(); }
BigInteger getActiveOutputChannels() const override { return outputWrapper.getActiveChannels(); }
@ -1469,46 +1475,16 @@ public:
Array<double> getAvailableSampleRates() override
{
Array<double> commonRates;
bool first = true;
for (auto& d : getDeviceWrappers())
{
auto rates = d->getAvailableSampleRates();
if (first)
{
first = false;
commonRates = rates;
}
else
{
commonRates.removeValuesNotIn (rates);
}
}
auto commonRates = inputWrapper.getAvailableSampleRates();
commonRates.removeValuesNotIn (outputWrapper.getAvailableSampleRates());
return commonRates;
}
Array<int> getAvailableBufferSizes() override
{
Array<int> commonSizes;
bool first = true;
for (auto& d : getDeviceWrappers())
{
auto sizes = d->getAvailableBufferSizes();
if (first)
{
first = false;
commonSizes = sizes;
}
else
{
commonSizes.removeValuesNotIn (sizes);
}
}
auto commonSizes = inputWrapper.getAvailableBufferSizes();
commonSizes.removeValuesNotIn (outputWrapper.getAvailableBufferSizes());
return commonSizes;
}
@ -1520,22 +1496,12 @@ public:
int getCurrentBitDepth() override
{
int depth = 32;
for (auto& d : getDeviceWrappers())
depth = jmin (depth, d->getCurrentBitDepth());
return depth;
return jmin (32, inputWrapper.getCurrentBitDepth(), outputWrapper.getCurrentBitDepth());
}
int getDefaultBufferSize() override
{
int size = 0;
for (auto& d : getDeviceWrappers())
size = jmax (size, d->getDefaultBufferSize());
return size;
return jmax (0, inputWrapper.getDefaultBufferSize(), outputWrapper.getDefaultBufferSize());
}
AudioWorkgroup getWorkgroup() const override
@ -2238,9 +2204,7 @@ public:
return d->getIndexOfDevice (asInput);
if (auto* d = dynamic_cast<AudioIODeviceCombiner*> (device))
for (auto* dev : d->getDeviceWrappers())
if (const auto index = dev->getIndexOfDevice (asInput); index >= 0)
return index;
return d->getIndexOfDevice (asInput);
return -1;
}