From aa0eea3ba8f7286f080df8e5209064d260780937 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 11 Oct 2017 22:52:52 +0200 Subject: [PATCH] NFM demod: removed rf bandwidth constants in GUI --- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 12 ++---------- plugins/channelrx/demodnfm/nfmdemodgui.h | 4 ---- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index ae345822a..4984239ef 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -17,14 +17,6 @@ const QString NFMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.nfm"; -const int NFMDemodGUI::m_rfBW[] = { - 5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000 -}; -const int NFMDemodGUI::m_fmDev[] = { // corresponding FM deviations - 1000, 1500, 2000, 2000, 2000, 2500, 3000, 3500, 5000 -}; -const int NFMDemodGUI::m_nbRfBW = 9; - NFMDemodGUI* NFMDemodGUI::create(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI) { NFMDemodGUI* gui = new NFMDemodGUI(pluginAPI, deviceAPI); @@ -332,8 +324,8 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg ui->rfBW->clear(); - for (int i = 0; i < m_nbRfBW; i++) { - ui->rfBW->addItem(QString("%1").arg(m_rfBW[i] / 1000.0, 0, 'f', 2)); + for (int i = 0; i < NFMDemodSettings::m_nbRfBW; i++) { + ui->rfBW->addItem(QString("%1").arg(NFMDemodSettings::getRFBW(i) / 1000.0, 0, 'f', 2)); } int ctcss_nbTones; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 071693e28..04cdbf3d5 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -72,10 +72,6 @@ private: uint32_t m_tickCount; MessageQueue m_inputMessageQueue; - static const int m_rfBW[]; - static const int m_fmDev[]; - static const int m_nbRfBW; - explicit NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL); virtual ~NFMDemodGUI();