diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 98bd34d58..cd9fe2aa8 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -1,4 +1,4 @@ -#include "../../channelrx/demodwfm/wfmdemodgui.h" +#include "wfmdemodgui.h" #include #include diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index 27f444999..c478feb97 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -1,13 +1,13 @@ -#include "../../channelrx/demodwfm/wfmplugin.h" +#include "wfmplugin.h" #include #include "plugin/pluginapi.h" -#include "../../channelrx/demodwfm/wfmdemodgui.h" +#include "wfmdemodgui.h" const PluginDescriptor WFMPlugin::m_pluginDescriptor = { QString("WFM Demodulator"), - QString("3.0.0"), + QString("3.1.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index 529027d56..36ca68896 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -40,14 +40,6 @@ const int WFMModGUI::m_rfBW[] = { }; const int WFMModGUI::m_nbRfBW = 14; -int WFMModGUI::requiredBW(int rfBW) -{ - if (rfBW < 96000) - return 96000; - else - return 384000; -} - WFMModGUI* WFMModGUI::create(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI) { WFMModGUI* gui = new WFMModGUI(pluginAPI, deviceAPI); diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h index e9f0512e0..11dd3b9ed 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.h +++ b/plugins/channeltx/modwfm/wfmmodgui.h @@ -109,7 +109,6 @@ private: explicit WFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* parent = NULL); virtual ~WFMModGUI(); - int requiredBW(int rfBW); void blockApplySettings(bool block); void applySettings(); void updateWithStreamData(); @@ -117,6 +116,15 @@ private: void leaveEvent(QEvent*); void enterEvent(QEvent*); + + static int requiredBW(int rfBW) + { + if (rfBW <= 96000) { + return 96000; + } else { + return (3*rfBW)/2; + } + } }; #endif /* PLUGINS_CHANNELTX_MODWFM_WFMMODGUI_H_ */ diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 5f93a801e..f7fa2d6c8 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -23,7 +23,7 @@ const PluginDescriptor WFMModPlugin::m_pluginDescriptor = { QString("WFM Modulator"), - QString("3.0.0"), + QString("3.1.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,