WFM mod: fixed requiredBW method

pull/27/head
f4exb 2017-01-08 19:54:51 +01:00
rodzic 01bf202ee4
commit c2c0c902d4
5 zmienionych plików z 14 dodań i 14 usunięć

Wyświetl plik

@ -1,4 +1,4 @@
#include "../../channelrx/demodwfm/wfmdemodgui.h"
#include "wfmdemodgui.h"
#include <device/devicesourceapi.h>
#include <dsp/downchannelizer.h>

Wyświetl plik

@ -1,13 +1,13 @@
#include "../../channelrx/demodwfm/wfmplugin.h"
#include "wfmplugin.h"
#include <QtPlugin>
#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,

Wyświetl plik

@ -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);

Wyświetl plik

@ -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_ */

Wyświetl plik

@ -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,