diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.cpp b/plugins/channelrx/udpsrc/udpsrcplugin.cpp index ee6a35c93..467135c5e 100644 --- a/plugins/channelrx/udpsrc/udpsrcplugin.cpp +++ b/plugins/channelrx/udpsrc/udpsrcplugin.cpp @@ -15,16 +15,16 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "../../channelrx/udpsrc/udpsrcplugin.h" +#include "udpsrcplugin.h" #include #include "plugin/pluginapi.h" -#include "../../channelrx/udpsrc/udpsrcgui.h" +#include "udpsrcgui.h" const PluginDescriptor UDPSrcPlugin::m_pluginDescriptor = { QString("UDP Channel Source"), - QString("3.5.0"), + QString("3.6.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/udpsink/udpsinkgui.cpp b/plugins/channeltx/udpsink/udpsinkgui.cpp index db188e677..5a157e5c5 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.cpp +++ b/plugins/channeltx/udpsink/udpsinkgui.cpp @@ -457,7 +457,7 @@ void UDPSinkGUI::on_udpPort_textEdited(const QString& arg1 __attribute__((unused ui->applyBtn->setEnabled(true); } -void UDPSinkGUI::on_volume_valueChanged(int value) +void UDPSinkGUI::on_gain_valueChanged(int value) { ui->gainText->setText(tr("%1").arg(value/10.0, 0, 'f', 1)); applySettings(); diff --git a/plugins/channeltx/udpsink/udpsinkgui.h b/plugins/channeltx/udpsink/udpsinkgui.h index 7715307ce..79e5759d0 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.h +++ b/plugins/channeltx/udpsink/udpsinkgui.h @@ -67,7 +67,7 @@ private slots: void on_applyBtn_clicked(); void onWidgetRolled(QWidget* widget, bool rollDown); void onMenuDoubleClicked(); - void on_volume_valueChanged(int value); + void on_gain_valueChanged(int value); void on_squelch_valueChanged(int value); void on_channelMute_toggled(bool checked); void tick(); diff --git a/plugins/channeltx/udpsink/udpsinkgui.ui b/plugins/channeltx/udpsink/udpsinkgui.ui index 1e49aa9ab..805d90a2e 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.ui +++ b/plugins/channeltx/udpsink/udpsinkgui.ui @@ -76,7 +76,7 @@ - + 0 0 @@ -644,6 +644,12 @@ + + + 0 + 22 + + Gain diff --git a/sdrbase/util/db.cpp b/sdrbase/util/db.cpp index 8e8a86ce4..55c76542d 100644 --- a/sdrbase/util/db.cpp +++ b/sdrbase/util/db.cpp @@ -21,7 +21,8 @@ double CalcDb::dbPower(double magsq, double floordB) { if (magsq > 0) { - return 10.0 * log10(magsq); + double val = 10.0 * log10(magsq); + return val > floordB ? val : floordB; } else {