got-feedBack/feedBack-desktop
1
0
Fork 0
mirror of https://github.com/got-feedBack/feedBack-desktop.git synced 2026-07-21 12:22:34 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(audio): clear duplexMode on duplex setup failure; review cleanups

Browse Source 
Address PR #114 review:
- failClosed now stores duplexMode=false so a failed reconfigure cannot
  leave the engine reporting duplex-active on a closed device.
- Drop the dead BigInteger initializers in the verify block.
- Move the applyDuplex locate-guard ahead of the source slice in the
  lifecycle test so marker drift fails with a clear message.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
OmikronApex 2026-07-17 14:03:56 +02:00
parent 78a3979a3a
commit cd93159751
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio/engine/DeviceSetup.cpp
View File

@ -266,6 +266,7 @@ juce::String DeviceSetup::applyDuplex(const juce::String& inputName,
state.currentSampleRate.store(0.0, std::memory_order_relaxed);
state.inputBlockSize.store(0, std::memory_order_relaxed);
state.outputBlockSize.store(0, std::memory_order_relaxed);
state.duplexMode.store(false, std::memory_order_relaxed);
try { monitorChain.releaseMonitorChain(); }
catch (...) {
fprintf(stderr, "[AudioEngine] Duplex failure cleanup: monitor release threw\n");
@ -409,20 +410,18 @@ juce::String DeviceSetup::applyDuplex(const juce::String& inputName,
// the requested contract. Rebuild those masks from the opened device's
// advertised channels so a failed pre-open probe cannot silently
// collapse an 8-input ASIO interface to the old two-channel fallback.
juce::BigInteger expectedInputs = setup.inputChannels;
if (!setup.useDefaultInputChannels)
{
expectedInputs.clear();
juce::BigInteger expectedInputs;
if (setup.useDefaultInputChannels)
expectedInputs = setup.inputChannels;
else
expectedInputs.setRange(
0, configuredDevice->getInputChannelNames().size(), true);
}
juce::BigInteger expectedOutputs = setup.outputChannels;
if (!setup.useDefaultOutputChannels)
{
expectedOutputs.clear();
juce::BigInteger expectedOutputs;
if (setup.useDefaultOutputChannels)
expectedOutputs = setup.outputChannels;
else
expectedOutputs.setRange(
0, juce::jmin(configuredDevice->getOutputChannelNames().size(), 2), true);
}
const auto actualInputs = configuredDevice->getActiveInputChannels();
const auto actualOutputs = configuredDevice->getActiveOutputChannels();

4
tests/device-setup-lifecycle.test.js
View File

@ -16,10 +16,12 @@ const source = fs.readFileSync(
const start = source.indexOf('juce::String DeviceSetup::applyDuplex');
const end = source.indexOf('DeviceConfigResult DeviceSetup::applySplit', start);
// Fail with a clear message before any slicing if the function markers move —
// a bad slice would otherwise make every assertion below fail confusingly.
assert.ok(start >= 0 && end > start, 'could not locate applyDuplex in DeviceSetup.cpp');
const applyDuplex = source.slice(start, end);
test('duplex setup closes Windows ASIO before constructing its channel probe', () => {
assert.ok(start >= 0 && end > start, 'could not locate applyDuplex');
assert.match(
applyDuplex,
/#elif JUCE_WINDOWS\s+closeBeforeReconfigure = \(currentTypeName == "ASIO"\);/);