From 6bd541d02e664505e3aacc643a46ecfb6919612f Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 9 Jan 2023 21:30:49 -0800 Subject: Update alsoft-config with the new settings --- utils/alsoft-config/mainwindow.cpp | 16 ++++++++++------ utils/alsoft-config/mainwindow.ui | 29 ++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) (limited to 'utils/alsoft-config') diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 09c7ca72..eb4458b2 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -463,6 +463,9 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->pulseAdjLatencyCheckBox, &QCheckBox::stateChanged, this, &MainWindow::enableApplyButton); connect(ui->pwireAssumeAudioCheckBox, &QCheckBox::stateChanged, this, &MainWindow::enableApplyButton); + connect(ui->pwireRtMixCheckBox, &QCheckBox::stateChanged, this, &MainWindow::enableApplyButton); + + connect(ui->wasapiResamplerCheckBox, &QCheckBox::stateChanged, this, &MainWindow::enableApplyButton); connect(ui->jackAutospawnCheckBox, &QCheckBox::stateChanged, this, &MainWindow::enableApplyButton); connect(ui->jackConnectPortsCheckBox, &QCheckBox::stateChanged, this, &MainWindow::enableApplyButton); @@ -931,8 +934,10 @@ void MainWindow::loadConfig(const QString &fname) ui->pulseFixRateCheckBox->setCheckState(getCheckState(settings.value("pulse/fix-rate"))); ui->pulseAdjLatencyCheckBox->setCheckState(getCheckState(settings.value("pulse/adjust-latency"))); - ui->pwireAssumeAudioCheckBox->setCheckState(settings.value("pipewire/assume-audio").toBool() - ? Qt::Checked : Qt::Unchecked); + ui->pwireAssumeAudioCheckBox->setCheckState(getCheckState(settings.value("pipewire/assume-audio"))); + ui->pwireRtMixCheckBox->setCheckState(getCheckState(settings.value("pipewire/rt-mix"))); + + ui->wasapiResamplerCheckBox->setCheckState(getCheckState(settings.value("wasapi/allow-resampler"))); ui->jackAutospawnCheckBox->setCheckState(getCheckState(settings.value("jack/spawn-server"))); ui->jackConnectPortsCheckBox->setCheckState(getCheckState(settings.value("jack/connect-ports"))); @@ -1135,11 +1140,10 @@ void MainWindow::saveConfig(const QString &fname) const (!ui->enableEaxCheck->isEnabled() || ui->enableEaxCheck->isChecked()) ? QString{/*"true"*/} : QString{"false"}); - settings.setValue("pipewire/assume-audio", ui->pwireAssumeAudioCheckBox->isChecked() - ? QString{"true"} : QString{/*"false"*/}); + settings.setValue("pipewire/assume-audio", getCheckValue(ui->pwireAssumeAudioCheckBox)); + settings.setValue("pipewire/rt-mix", getCheckValue(ui->pwireRtMixCheckBox)); - settings.setValue("wasapi/allow-resampler", ui->wasapiResamplerCheckBox->isChecked() - ? QString{/*"true"*/} : QString{"false"}); + settings.setValue("wasapi/allow-resampler", getCheckValue(ui->wasapiResamplerCheckBox)); settings.setValue("pulse/spawn-server", getCheckValue(ui->pulseAutospawnCheckBox)); settings.setValue("pulse/allow-moves", getCheckValue(ui->pulseAllowMovesCheckBox)); diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui index 2a997995..b959cf74 100644 --- a/utils/alsoft-config/mainwindow.ui +++ b/utils/alsoft-config/mainwindow.ui @@ -1360,6 +1360,33 @@ are reported. Assume audio support + + true + + + + + + 20 + 40 + 161 + 21 + + + + Renders samples directly in the real-time +processing callback. This allows for lower +latency and less overall CPU utilization, but +can increase the risk of underruns when +increasing the amount of processing the +mixer needs to do. + + + Real-time Mixing + + + true + @@ -1382,7 +1409,7 @@ for output. Allow Resampler - + true -- cgit v1.2.3