Allow setting backend samplerate/buffer size independent of device configuration

For cases when no Mixxx device is configured, like when using PipeWire patchbay mode

Author: pri-yan-shu

src/soundio/pipewireenumerator.cpp

@@ -87,6 +87,7 @@ PipewireEnumerator::PipewireEnumerator(UserSettingsPointer, SoundManager* pManag
           m_sampleRate(48000),
           m_audioLatencyUsage(kAppGroup, QStringLiteral("audio_latency_usage")),
           m_coPipewirePatchbaySync(ConfigKey(kAppGroup, QStringLiteral("pipewire_patchbay_sync"))),
+          m_coOutputLatencyMs(kAppGroup, QStringLiteral("output_latency_ms")),
           m_framesPerBuffer(0) {
     connect(m_pSoundManager,
             &SoundManager::inputRegistered,
@@ -558,9 +559,7 @@ bool PipewireEnumerator::isOpen(uint32_t id) {
 }
 
 std::string PipewireEnumerator::openDeviceInput(uint32_t deviceId,
-        const AudioInput& input,
-        mixxx::audio::SampleRate sampleRate,
-        SINT framesPerBuffer) {
+        const AudioInput& input) {
     std::string result;
     VERIFY_OR_DEBUG_ASSERT(m_initialized) {
         qDebug() << "PipewireEnumerator::openDevice called when "
@@ -572,10 +571,6 @@ std::string PipewireEnumerator::openDeviceInput(uint32_t deviceId,
         return {};
     }
 
-    if (sampleRate != m_sampleRate || framesPerBuffer != m_framesPerBuffer) {
-        updateFilterLatency(sampleRate, framesPerBuffer);
-    }
-
     PortPair& ports = m_inputs.at(input);
     ports.activeDevice = deviceId;
 
@@ -605,10 +600,7 @@ std::string PipewireEnumerator::openDeviceInput(uint32_t deviceId,
     return result;
 }
 
-std::string PipewireEnumerator::openDeviceOutput(uint32_t deviceId,
-        const AudioOutput& output,
-        mixxx::audio::SampleRate sampleRate,
-        SINT framesPerBuffer) {
+std::string PipewireEnumerator::openDeviceOutput(uint32_t deviceId, const AudioOutput& output) {
     std::string result;
     VERIFY_OR_DEBUG_ASSERT(m_initialized) {
         qDebug() << "PipewireEnumerator::openDevice called when "
@@ -620,10 +612,6 @@ std::string PipewireEnumerator::openDeviceOutput(uint32_t deviceId,
         return {};
     }
 
-    if (sampleRate != m_sampleRate || framesPerBuffer != m_framesPerBuffer) {
-        updateFilterLatency(sampleRate, framesPerBuffer);
-    }
-
     PortPair& ports = m_outputs.at(output);
     ports.activeDevice = deviceId;
 
@@ -1031,3 +1019,11 @@ bool PipewireEnumerator::nodeHasPorts(const Node& node) {
 
     return false;
 }
+
+void PipewireEnumerator::setLatencyParams(
+        mixxx::audio::SampleRate sampleRate, SINT framesPerBuffer) {
+    qDebug() << "PipewireEnumerator::setLatencyParams" << sampleRate << framesPerBuffer;
+    if (sampleRate != m_sampleRate || framesPerBuffer != m_framesPerBuffer) {
+        updateFilterLatency(sampleRate, framesPerBuffer);
+    }
+}

src/soundio/pipewireenumerator.h

@@ -9,6 +9,7 @@
 
 #include "audio/types.h"
 #include "control/controlobject.h"
+#include "control/controlproxy.h"
 #include "preferences/usersettings.h"
 #include "soundio/sounddevice.h"
 #include "soundio/sounddeviceenumerator.h"
@@ -35,16 +36,12 @@ class PipewireEnumerator : public SoundDeviceEnumerator {
     void deinitialize() override;
 
     bool isOpen(uint32_t id);
-    std::string openDeviceInput(uint32_t id,
-            const AudioInput& input,
-            mixxx::audio::SampleRate sampleRate,
-            SINT framesPerBuffer);
-    std::string openDeviceOutput(uint32_t id,
-            const AudioOutput& output,
-            mixxx::audio::SampleRate sampleRate,
-            SINT framesPerBuffer);
+    std::string openDeviceInput(uint32_t id, const AudioInput& input);
+    std::string openDeviceOutput(uint32_t id, const AudioOutput& output);
     void closeDevices();
 
+    void setLatencyParams(mixxx::audio::SampleRate sampleRate, SINT framesPerBuffer) override;
+
     mixxx::audio::SampleRate getDefaultSampleRate() const {
         return m_defaultSampleRate;
     }
@@ -244,6 +241,7 @@ class PipewireEnumerator : public SoundDeviceEnumerator {
 
     PollingControlProxy m_audioLatencyUsage;
     ControlObject m_coPipewirePatchbaySync;
+    ControlProxy m_coOutputLatencyMs;
     mixxx::Duration m_timeInAudioCallback;
     int m_framesSinceAudioLatencyUsageUpdate;
     uint32_t m_filterId;

src/soundio/sounddeviceenumerator.h

@@ -15,6 +15,9 @@ class SoundDeviceEnumerator : public QObject {
     virtual QList<QString> getAPIs() const = 0;
     virtual void initialize() = 0;
     virtual void deinitialize() = 0;
+    virtual void setLatencyParams(
+            [[maybe_unused]] mixxx::audio::SampleRate sampleRate,
+            [[maybe_unused]] SINT framesPerBuffer) {};
 
     bool initialized() const {
         return m_initialized;

src/soundio/sounddevicepipewire.cpp

@@ -38,17 +38,11 @@ SoundDevicePipewire::~SoundDevicePipewire() {
 SoundDeviceStatus SoundDevicePipewire::open(bool, int) {
     std::string error;
     for (auto& input : m_audioInputs) {
-        error += m_pEnumerator->openDeviceInput(m_deviceId.deviceIndex,
-                input,
-                m_sampleRate,
-                m_configFramesPerBuffer);
+        error += m_pEnumerator->openDeviceInput(m_deviceId.deviceIndex, input);
     }
 
     for (auto& output : m_audioOutputs) {
-        error += m_pEnumerator->openDeviceOutput(m_deviceId.deviceIndex,
-                output,
-                m_sampleRate,
-                m_configFramesPerBuffer);
+        error += m_pEnumerator->openDeviceOutput(m_deviceId.deviceIndex, output);
     }
 
     if (error.empty()) {

src/soundio/soundmanager.cpp

@@ -334,6 +334,9 @@ SoundDeviceStatus SoundManager::setupDevices() {
     // loop over all available devices
 
     std::vector<SoundDevicePointer> devices = m_pEnumerator->queryDevices();
+
+    m_pEnumerator->setLatencyParams(m_config.getSampleRate(), m_config.getFramesPerBuffer());
+
     // here some network device conditions can be separated, currently simply
     // add it to the list of other devices
     devices.push_back(m_pNetworkDevice);