From 3df388ea8a8653788f786a451f7c54c21c5ae341 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 22 May 2017 02:53:21 +0200 Subject: [PATCH] SDRdaemonSink: fixed center frequency and sample rate transmission to remote --- .../sdrdaemonsink/sdrdaemonsinkgui.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index ce381e947..b5840ba2c 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -264,22 +264,21 @@ void SDRdaemonSinkGui::sendControl(bool force) if ((m_settings.m_centerFrequency != m_controlSettings.m_centerFrequency) || force) { - os << "freq=" << m_settings.m_centerFrequency*1000LL; + os << "freq=" << m_settings.m_centerFrequency; nbArgs++; } - if ((m_settings.m_sampleRate != m_controlSettings.m_sampleRate) || force) + if ((m_settings.m_sampleRate != m_controlSettings.m_sampleRate) || (m_settings.m_log2Interp != m_controlSettings.m_log2Interp) || force) { if (nbArgs > 0) os << ","; - os << "srate=" << m_settings.m_sampleRate; + os << "srate=" << m_settings.m_sampleRate * (1< 0) os << ","; - os << "interp=" << m_settings.m_log2Interp; - nbArgs++; + if ((m_settings.m_log2Interp != m_controlSettings.m_log2Interp) || force) + { + os << ",interp=" << m_settings.m_log2Interp; + nbArgs++; + } } if ((m_settings.m_specificParameters != m_controlSettings.m_specificParameters) || force) @@ -313,7 +312,7 @@ void SDRdaemonSinkGui::sendControl(bool force) m_controlSettings.m_address = m_settings.m_address; m_controlSettings.m_controlPort = m_settings.m_controlPort; - m_controlSettings.m_centerFrequency = m_settings.m_controlPort; + m_controlSettings.m_centerFrequency = m_settings.m_centerFrequency; m_controlSettings.m_sampleRate = m_settings.m_sampleRate; m_controlSettings.m_log2Interp = m_settings.m_log2Interp; m_controlSettings.m_specificParameters = m_settings.m_specificParameters;