diff --git a/debian/changelog b/debian/changelog index 2d9bad898..7bfb1f3dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,9 @@ sdrangel (3.9.1-1) unstable; urgency=medium * Transmission: make source channels working concurrently in multiple channel * Transmission: connect source channel directly to device FIFO in single channel - * NFM and WFM modulators: fixes + * NFM, WFM modulators and UDP sink: fixes - -- Edouard Griffiths, F4EXB Sat, 30 Dec 2017 17:14:18 +0100 + -- Edouard Griffiths, F4EXB Tue, 02 Jan 2018 21:14:18 +0100 sdrangel (3.9.0-1) unstable; urgency=medium diff --git a/plugins/channeltx/udpsink/udpsink.cpp b/plugins/channeltx/udpsink/udpsink.cpp index 3c74575cd..2814bb0b4 100644 --- a/plugins/channeltx/udpsink/udpsink.cpp +++ b/plugins/channeltx/udpsink/udpsink.cpp @@ -454,7 +454,7 @@ void UDPSink::applyChannelSettings(int basebandSampleRate, int outputSampleRate, m_settingsMutex.unlock(); } - if (outputSampleRate != m_outputSampleRate) + if ((outputSampleRate != m_outputSampleRate) && (!m_settings.m_autoRWBalance)) { m_settingsMutex.lock(); m_interpolatorDistanceRemain = 0; @@ -462,8 +462,6 @@ void UDPSink::applyChannelSettings(int basebandSampleRate, int outputSampleRate, m_interpolatorDistance = (Real) m_settings.m_inputSampleRate / (Real) outputSampleRate; m_interpolator.create(48, m_settings.m_inputSampleRate, m_settings.m_rfBandwidth / 2.2, 3.0); m_settingsMutex.unlock(); - m_squelchThreshold = outputSampleRate * m_settings.m_squelchGate; - initSquelch(m_squelchOpen); } m_basebandSampleRate = basebandSampleRate; diff --git a/plugins/channeltx/udpsink/udpsinkgui.cpp b/plugins/channeltx/udpsink/udpsinkgui.cpp index 1ef46ba55..d408c0b9b 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.cpp +++ b/plugins/channeltx/udpsink/udpsinkgui.cpp @@ -251,7 +251,8 @@ void UDPSinkGUI::channelMarkerChangedByCursor() void UDPSinkGUI::on_deltaFrequency_changed(qint64 value) { m_settings.m_inputFrequencyOffset = value; - m_channelMarker.setCenterFrequency(value); // will trigger apply settings + m_channelMarker.setCenterFrequency(value); + applySettings(); } void UDPSinkGUI::on_sampleFormat_currentIndexChanged(int index) @@ -436,6 +437,7 @@ void UDPSinkGUI::onMenuDialogCalled(const QPoint &p) setWindowTitle(m_channelMarker.getTitle()); setTitleColor(m_settings.m_rgbColor); + ui->addressText->setText(tr("%1:%2").arg(m_settings.m_udpAddress).arg(m_settings.m_udpPort)); applySettings(); } diff --git a/plugins/channeltx/udpsink/udpsinkplugin.cpp b/plugins/channeltx/udpsink/udpsinkplugin.cpp index 37b085c23..37608b22a 100644 --- a/plugins/channeltx/udpsink/udpsinkplugin.cpp +++ b/plugins/channeltx/udpsink/udpsinkplugin.cpp @@ -24,7 +24,7 @@ const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = { QString("UDP Channel Sink"), - QString("3.9.0"), + QString("3.9.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,