From 8653d326b363c2a7a490e99f5b6dad162b6790bf Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 14 Apr 2020 22:32:21 +0200 Subject: [PATCH] XTRX: effectively allow auto hardware decimation/interpolation --- devices/xtrx/devicextrx.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/devices/xtrx/devicextrx.cpp b/devices/xtrx/devicextrx.cpp index 9cac1d16b..eaa83b2a0 100644 --- a/devices/xtrx/devicextrx.cpp +++ b/devices/xtrx/devicextrx.cpp @@ -117,21 +117,12 @@ void DeviceXTRX::getAutoGains(uint32_t autoGain, uint32_t& lnaGain, uint32_t& ti double DeviceXTRX::set_samplerate(double rate, double master, bool output) { - if (output) - { + m_masterRate = master; + + if (output) { m_outputRate = rate; - - if (master != 0.0) { - m_masterRate = master; - } - } - else - { + } else { m_inputRate = rate; - - if (master != 0.0) { - m_masterRate = master; - } } int res = xtrx_set_samplerate(m_dev, @@ -145,7 +136,7 @@ double DeviceXTRX::set_samplerate(double rate, double master, bool output) if (res) { - qCritical("DeviceXTRX::set_samplerate: Unable to set %s samplerate, m_masterRate: %f, m_inputRate: %f, m_outputRate: %f, error=%d\n", + qCritical("DeviceXTRX::set_samplerate: Unable to set %s samplerate, m_masterRate: %f, m_inputRate: %f, m_outputRate: %f, error=%d", output ? "output" : "input", m_masterRate, m_inputRate, m_outputRate, res); return 0; }