From 20c6fb19cc4348bfe40ff8df167e8eea6dda8db1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 2 Oct 2016 21:52:39 +0200 Subject: [PATCH] RxTx semantic move: renamed Channelizer to DownChannelizer --- CMakeLists.txt | 4 +-- plugins/channelrx/chanalyzer/chanalyzer.cpp | 6 ++-- .../channelrx/chanalyzer/chanalyzergui.cpp | 4 +-- plugins/channelrx/chanalyzer/chanalyzergui.h | 4 +-- plugins/channelrx/demodam/amdemod.cpp | 6 ++-- plugins/channelrx/demodam/amdemodgui.cpp | 4 +-- plugins/channelrx/demodam/amdemodgui.h | 4 +-- plugins/channelrx/demodbfm/bfmdemod.cpp | 7 +++-- plugins/channelrx/demodbfm/bfmdemodgui.cpp | 4 +-- plugins/channelrx/demodbfm/bfmdemodgui.h | 4 +-- plugins/channelrx/demoddsd/dsddemod.cpp | 6 ++-- plugins/channelrx/demoddsd/dsddemodgui.cpp | 4 +-- plugins/channelrx/demoddsd/dsddemodgui.h | 4 +-- plugins/channelrx/demodlora/lorademod.cpp | 7 ++--- plugins/channelrx/demodlora/lorademodgui.cpp | 4 +-- plugins/channelrx/demodlora/lorademodgui.h | 4 +-- plugins/channelrx/demodnfm/nfmdemod.cpp | 6 ++-- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 4 +-- plugins/channelrx/demodnfm/nfmdemodgui.h | 4 +-- plugins/channelrx/demodssb/ssbdemod.cpp | 6 ++-- plugins/channelrx/demodssb/ssbdemodgui.cpp | 4 +-- plugins/channelrx/demodssb/ssbdemodgui.h | 4 +-- plugins/channelrx/demodwfm/wfmdemod.cpp | 6 ++-- plugins/channelrx/demodwfm/wfmdemodgui.cpp | 4 +-- plugins/channelrx/demodwfm/wfmdemodgui.h | 4 +-- plugins/channelrx/tcpsrc/tcpsrc.cpp | 6 ++-- plugins/channelrx/tcpsrc/tcpsrcgui.cpp | 4 +-- plugins/channelrx/tcpsrc/tcpsrcgui.h | 4 +-- plugins/channelrx/udpsrc/udpsrc.cpp | 6 ++-- plugins/channelrx/udpsrc/udpsrcgui.cpp | 4 +-- plugins/channelrx/udpsrc/udpsrcgui.h | 4 +-- .../{channelizer.cpp => downchannelizer.cpp} | 30 +++++++++---------- .../dsp/{channelizer.h => downchannelizer.h} | 6 ++-- sdrbase/dsp/dspdeviceengine.cpp | 2 +- sdrbase/sdrbase.pro | 4 +-- 35 files changed, 94 insertions(+), 94 deletions(-) rename sdrbase/dsp/{channelizer.cpp => downchannelizer.cpp} (86%) rename sdrbase/dsp/{channelizer.h => downchannelizer.h} (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dd140d8e..e64ed404e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ set(sdrbase_SOURCES sdrbase/dsp/afsquelch.cpp sdrbase/dsp/agc.cpp - sdrbase/dsp/channelizer.cpp + sdrbase/dsp/downchannelizer.cpp sdrbase/dsp/channelmarker.cpp sdrbase/dsp/ctcssdetector.cpp sdrbase/dsp/dspcommands.cpp @@ -177,7 +177,7 @@ set(sdrbase_HEADERS sdrbase/audio/audiooutput.h sdrbase/dsp/afsquelch.h - sdrbase/dsp/channelizer.h + sdrbase/dsp/downchannelizer.h sdrbase/dsp/channelmarker.h sdrbase/dsp/complex.h sdrbase/dsp/decimators.h diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index 396a4b72b..d11c17f24 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -16,11 +16,11 @@ #include "../../channelrx/chanalyzer/chanalyzer.h" +#include #include #include #include #include "audio/audiooutput.h" -#include "dsp/channelizer.h" MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message) @@ -137,9 +137,9 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd) qDebug() << "ChannelAnalyzer::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_sampleRate = notif.getSampleRate(); m_nco.setFreq(-notif.getFrequencyOffset(), m_sampleRate); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 29d05baff..fe978a8a0 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -16,11 +16,11 @@ #include "../../channelrx/chanalyzer/chanalyzergui.h" +#include #include #include #include "ui_chanalyzergui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/spectrumscopecombovis.h" #include "dsp/spectrumvis.h" #include "dsp/scopevis.h" @@ -326,7 +326,7 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAP m_scopeVis = new ScopeVis(ui->glScope); m_spectrumScopeComboVis = new SpectrumScopeComboVis(m_spectrumVis, m_scopeVis); m_channelAnalyzer = new ChannelAnalyzer(m_spectrumScopeComboVis); - m_channelizer = new Channelizer(m_channelAnalyzer); + m_channelizer = new DownChannelizer(m_channelAnalyzer); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); connect(m_channelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged())); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index aa9909a7c..ba8db688a 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -26,7 +26,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class ChannelAnalyzer; class SpectrumScopeComboVis; class SpectrumVis; @@ -81,7 +81,7 @@ private: MovingAverage m_channelPowerDbAvg; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; ChannelAnalyzer* m_channelAnalyzer; SpectrumScopeComboVis* m_spectrumScopeComboVis; SpectrumVis* m_spectrumVis; diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index 94a202d83..c0212b40b 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -20,9 +20,9 @@ #include #include #include +#include #include "audio/audiooutput.h" #include "dsp/dspengine.h" -#include "dsp/channelizer.h" #include "dsp/pidcontroller.h" MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message) @@ -187,9 +187,9 @@ bool AMDemod::handleMessage(const Message& cmd) { qDebug() << "AMDemod::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_config.m_inputSampleRate = notif.getSampleRate(); m_config.m_inputFrequencyOffset = notif.getFrequencyOffset(); diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 3a730e940..5a166f705 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -1,10 +1,10 @@ #include "../../channelrx/demodam/amdemodgui.h" +#include #include #include #include "ui_amdemodgui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "plugin/pluginapi.h" #include "device/deviceapi.h" #include "util/simpleserializer.h" @@ -220,7 +220,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pare connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked())); m_amDemod = new AMDemod(); - m_channelizer = new Channelizer(m_amDemod); + m_channelizer = new DownChannelizer(m_amDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); //m_pluginAPI->addThreadedSink(m_threadedChannelizer); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index e283ae5e9..37fe5c2a6 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -10,7 +10,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class AMDemod; namespace Ui { @@ -59,7 +59,7 @@ private: bool m_doApplySettings; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; AMDemod* m_amDemod; MovingAverage m_channelPowerDbAvg; bool m_squelchOpen; diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index ece5602d0..b51f0d6e6 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -23,10 +23,11 @@ #include #include "audio/audiooutput.h" #include "dsp/dspengine.h" -#include "dsp/channelizer.h" #include "dsp/pidcontroller.h" #include "bfmdemod.h" +#include + #include "../../channelrx/demodbfm/rdsparser.h" MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message) @@ -285,9 +286,9 @@ void BFMDemod::stop() bool BFMDemod::handleMessage(const Message& cmd) { - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_config.m_inputSampleRate = notif.getSampleRate(); m_config.m_inputFrequencyOffset = notif.getFrequencyOffset(); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index e9db121fb..0c1556e98 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -17,6 +17,7 @@ #include "../../channelrx/demodbfm/bfmdemodgui.h" +#include #include #include #include @@ -26,7 +27,6 @@ #include #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/dspengine.h" #include "dsp/spectrumvis.h" #include "gui/glspectrum.h" @@ -381,7 +381,7 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pa m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_bfmDemod = new BFMDemod(m_spectrumVis, &m_rdsParser); - m_channelizer = new Channelizer(m_bfmDemod); + m_channelizer = new DownChannelizer(m_bfmDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); connect(m_channelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged())); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index 667beb065..6c079bbcd 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -29,7 +29,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class SpectrumVis; class BFMDemod; @@ -89,7 +89,7 @@ private: int m_rdsTimerCount; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; SpectrumVis* m_spectrumVis; RDSParser m_rdsParser; diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 61ace9642..f67984699 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -21,8 +21,8 @@ #include #include #include +#include #include "audio/audiooutput.h" -#include "dsp/channelizer.h" #include "dsp/pidcontroller.h" #include "dsp/dspengine.h" #include "../../channelrx/demoddsd/dsddemodgui.h" @@ -321,9 +321,9 @@ bool DSDDemod::handleMessage(const Message& cmd) { qDebug() << "DSDDemod::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_config.m_inputSampleRate = notif.getSampleRate(); m_config.m_inputFrequencyOffset = notif.getFrequencyOffset(); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 48cf13fe6..f3207bb22 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -17,12 +17,12 @@ #include "../../channelrx/demoddsd/dsddemodgui.h" +#include #include #include #include #include "ui_dsddemodgui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/scopevis.h" #include "gui/glscope.h" #include "plugin/pluginapi.h" @@ -370,7 +370,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pa ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); - m_channelizer = new Channelizer(m_dsdDemod); + m_channelizer = new DownChannelizer(m_dsdDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 914a0e405..193ac03ca 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -28,7 +28,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class ScopeVis; class DSDDemod; @@ -98,7 +98,7 @@ private: SignalFormat m_signalFormat; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; ScopeVis* m_scopeVis; DSDDemod* m_dsdDemod; diff --git a/plugins/channelrx/demodlora/lorademod.cpp b/plugins/channelrx/demodlora/lorademod.cpp index e75d877ba..9f935500b 100644 --- a/plugins/channelrx/demodlora/lorademod.cpp +++ b/plugins/channelrx/demodlora/lorademod.cpp @@ -18,11 +18,10 @@ #include "../../channelrx/demodlora/lorademod.h" +#include #include #include #include -#include "dsp/channelizer.h" - #include "../../channelrx/demodlora/lorabits.h" MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureLoRaDemod, Message) @@ -285,9 +284,9 @@ bool LoRaDemod::handleMessage(const Message& cmd) { qDebug() << "LoRaDemod::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_settingsMutex.lock(); diff --git a/plugins/channelrx/demodlora/lorademodgui.cpp b/plugins/channelrx/demodlora/lorademodgui.cpp index 56385fb4d..b40addf69 100644 --- a/plugins/channelrx/demodlora/lorademodgui.cpp +++ b/plugins/channelrx/demodlora/lorademodgui.cpp @@ -1,12 +1,12 @@ #include "../../channelrx/demodlora/lorademodgui.h" #include "../../channelrx/demodlora/lorademodgui.h" +#include #include #include #include "ui_lorademodgui.h" #include "ui_lorademodgui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/spectrumvis.h" #include "gui/glspectrum.h" #include "plugin/pluginapi.h" @@ -166,7 +166,7 @@ LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_LoRaDemod = new LoRaDemod(m_spectrumVis); - m_channelizer = new Channelizer(m_LoRaDemod); + m_channelizer = new DownChannelizer(m_LoRaDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demodlora/lorademodgui.h b/plugins/channelrx/demodlora/lorademodgui.h index a62e5df27..7e69721f0 100644 --- a/plugins/channelrx/demodlora/lorademodgui.h +++ b/plugins/channelrx/demodlora/lorademodgui.h @@ -10,7 +10,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class LoRaDemod; class SpectrumVis; @@ -54,7 +54,7 @@ private: bool m_doApplySettings; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; LoRaDemod* m_LoRaDemod; SpectrumVis* m_spectrumVis; diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index ae4fba48d..3b8c51f5d 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -21,8 +21,8 @@ #include #include #include +#include #include "audio/audiooutput.h" -#include "dsp/channelizer.h" #include "dsp/pidcontroller.h" #include "dsp/dspengine.h" #include "../../channelrx/demodnfm/nfmdemodgui.h" @@ -280,9 +280,9 @@ bool NFMDemod::handleMessage(const Message& cmd) { qDebug() << "NFMDemod::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_config.m_inputSampleRate = notif.getSampleRate(); m_config.m_inputFrequencyOffset = notif.getFrequencyOffset(); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 08fcdbb87..e045b746e 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -1,11 +1,11 @@ #include "../../channelrx/demodnfm/nfmdemodgui.h" +#include #include #include #include #include "ui_nfmdemodgui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/nullsink.h" #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -292,7 +292,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pa ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); - m_channelizer = new Channelizer(m_nfmDemod); + m_channelizer = new DownChannelizer(m_nfmDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 84225054b..43df1d9a0 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -11,7 +11,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class NFMDemod; namespace Ui { @@ -64,7 +64,7 @@ private: bool m_doApplySettings; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; NFMDemod* m_nfmDemod; bool m_ctcssOn; bool m_audioMute; diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index c8418c34c..e4530fe9b 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -18,12 +18,12 @@ #include "../../channelrx/demodssb/ssbdemod.h" +#include #include #include #include #include "audio/audiooutput.h" #include "dsp/dspengine.h" -#include "dsp/channelizer.h" MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message) @@ -220,9 +220,9 @@ bool SSBDemod::handleMessage(const Message& cmd) qDebug() << "SSBDemod::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_settingsMutex.lock(); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index 48cc3d9c6..d573a045b 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -1,12 +1,12 @@ #include "../../channelrx/demodssb/ssbdemodgui.h" #include "../../channelrx/demodssb/ssbdemodgui.h" +#include #include #include #include "ui_ssbdemodgui.h" #include "ui_ssbdemodgui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/spectrumvis.h" #include "gui/glspectrum.h" #include "plugin/pluginapi.h" @@ -341,7 +341,7 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pa m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_ssbDemod = new SSBDemod(m_spectrumVis); - m_channelizer = new Channelizer(m_ssbDemod); + m_channelizer = new DownChannelizer(m_ssbDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index b9e784a08..6b649379a 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -11,7 +11,7 @@ class DeviceAPI; class AudioFifo; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class SSBDemod; class SpectrumVis; @@ -71,7 +71,7 @@ private: MovingAverage m_channelPowerDbAvg; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; SSBDemod* m_ssbDemod; SpectrumVis* m_spectrumVis; diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index 971fbc86d..8ea896ce9 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -21,9 +21,9 @@ #include #include #include +#include #include "audio/audiooutput.h" #include "dsp/dspengine.h" -#include "dsp/channelizer.h" #include "dsp/pidcontroller.h" MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) @@ -180,9 +180,9 @@ bool WFMDemod::handleMessage(const Message& cmd) { qDebug() << "WFMDemod::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_config.m_inputSampleRate = notif.getSampleRate(); m_config.m_inputFrequencyOffset = notif.getFrequencyOffset(); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index bde8aea2a..257d7902f 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -1,11 +1,11 @@ #include "../../channelrx/demodwfm/wfmdemodgui.h" +#include #include #include #include #include "ui_wfmdemodgui.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/dspengine.h" #include "plugin/pluginapi.h" #include "device/deviceapi.h" @@ -235,7 +235,7 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pa connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked())); m_wfmDemod = new WFMDemod(0); - m_channelizer = new Channelizer(m_wfmDemod); + m_channelizer = new DownChannelizer(m_wfmDemod); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index df44c4682..66396fafb 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -10,7 +10,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class WFMDemod; namespace Ui { @@ -58,7 +58,7 @@ private: bool m_doApplySettings; ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; WFMDemod* m_wfmDemod; MovingAverage m_channelPowerDbAvg; diff --git a/plugins/channelrx/tcpsrc/tcpsrc.cpp b/plugins/channelrx/tcpsrc/tcpsrc.cpp index 5e3c35bd1..e151b22e0 100644 --- a/plugins/channelrx/tcpsrc/tcpsrc.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrc.cpp @@ -16,10 +16,10 @@ #include "../../channelrx/tcpsrc/tcpsrc.h" +#include #include #include #include -#include "dsp/channelizer.h" #include "../../channelrx/tcpsrc/tcpsrcgui.h" MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConfigure, Message) @@ -181,9 +181,9 @@ bool TCPSrc::handleMessage(const Message& cmd) { qDebug() << "TCPSrc::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_settingsMutex.lock(); diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp index 7d3ea70d4..d5dab99ae 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp @@ -1,9 +1,9 @@ #include "../../channelrx/tcpsrc/tcpsrcgui.h" +#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/spectrumvis.h" #include "dsp/dspengine.h" #include "util/simpleserializer.h" @@ -202,7 +202,7 @@ TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_tcpSrc = new TCPSrc(m_pluginAPI->getMainWindowMessageQueue(), this, m_spectrumVis); - m_channelizer = new Channelizer(m_tcpSrc); + m_channelizer = new DownChannelizer(m_tcpSrc); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.h b/plugins/channelrx/tcpsrc/tcpsrcgui.h index d48219049..6da22ac3e 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.h +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.h @@ -12,7 +12,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class TCPSrc; class SpectrumVis; @@ -73,7 +73,7 @@ private: // RF path ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; SpectrumVis* m_spectrumVis; explicit TCPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = 0); diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp index 442f7d7c3..03d37ebac 100644 --- a/plugins/channelrx/udpsrc/udpsrc.cpp +++ b/plugins/channelrx/udpsrc/udpsrc.cpp @@ -17,10 +17,10 @@ #include "../../channelrx/udpsrc/udpsrc.h" +#include #include #include #include -#include "dsp/channelizer.h" #include "dsp/dspengine.h" #include "../../channelrx/udpsrc/udpsrcgui.h" @@ -255,9 +255,9 @@ bool UDPSrc::handleMessage(const Message& cmd) { qDebug() << "UDPSrc::handleMessage"; - if (Channelizer::MsgChannelizerNotification::match(cmd)) + if (DownChannelizer::MsgChannelizerNotification::match(cmd)) { - Channelizer::MsgChannelizerNotification& notif = (Channelizer::MsgChannelizerNotification&) cmd; + DownChannelizer::MsgChannelizerNotification& notif = (DownChannelizer::MsgChannelizerNotification&) cmd; m_settingsMutex.lock(); diff --git a/plugins/channelrx/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp index 4f35f0745..adbe21037 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.cpp +++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp @@ -17,10 +17,10 @@ #include "../../channelrx/udpsrc/udpsrcgui.h" +#include #include "plugin/pluginapi.h" #include "device/deviceapi.h" #include "dsp/threadedsamplesink.h" -#include "dsp/channelizer.h" #include "dsp/spectrumvis.h" #include "dsp/dspengine.h" #include "util/simpleserializer.h" @@ -240,7 +240,7 @@ UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_udpSrc = new UDPSrc(m_pluginAPI->getMainWindowMessageQueue(), this, m_spectrumVis); - m_channelizer = new Channelizer(m_udpSrc); + m_channelizer = new DownChannelizer(m_udpSrc); m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this); m_deviceAPI->addThreadedSink(m_threadedChannelizer); diff --git a/plugins/channelrx/udpsrc/udpsrcgui.h b/plugins/channelrx/udpsrc/udpsrcgui.h index 44e97a6eb..edb99df72 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.h +++ b/plugins/channelrx/udpsrc/udpsrcgui.h @@ -29,7 +29,7 @@ class PluginAPI; class DeviceAPI; class ThreadedSampleSink; -class Channelizer; +class DownChannelizer; class UDPSrc; class SpectrumVis; @@ -102,7 +102,7 @@ private: // RF path ThreadedSampleSink* m_threadedChannelizer; - Channelizer* m_channelizer; + DownChannelizer* m_channelizer; SpectrumVis* m_spectrumVis; explicit UDPSrcGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* parent = 0); diff --git a/sdrbase/dsp/channelizer.cpp b/sdrbase/dsp/downchannelizer.cpp similarity index 86% rename from sdrbase/dsp/channelizer.cpp rename to sdrbase/dsp/downchannelizer.cpp index a94bad8dd..1454091ce 100644 --- a/sdrbase/dsp/channelizer.cpp +++ b/sdrbase/dsp/downchannelizer.cpp @@ -1,13 +1,13 @@ -#include "dsp/channelizer.h" +#include #include "dsp/inthalfbandfilter.h" #include "dsp/dspcommands.h" #include #include -MESSAGE_CLASS_DEFINITION(Channelizer::MsgChannelizerNotification, Message) +MESSAGE_CLASS_DEFINITION(DownChannelizer::MsgChannelizerNotification, Message) -Channelizer::Channelizer(SampleSink* sampleSink) : +DownChannelizer::DownChannelizer(SampleSink* sampleSink) : m_sampleSink(sampleSink), m_inputSampleRate(0), m_requestedOutputSampleRate(0), @@ -19,18 +19,18 @@ Channelizer::Channelizer(SampleSink* sampleSink) : setObjectName(name); } -Channelizer::~Channelizer() +DownChannelizer::~DownChannelizer() { freeFilterChain(); } -void Channelizer::configure(MessageQueue* messageQueue, int sampleRate, int centerFrequency) +void DownChannelizer::configure(MessageQueue* messageQueue, int sampleRate, int centerFrequency) { Message* cmd = new DSPConfigureChannelizer(sampleRate, centerFrequency); messageQueue->push(cmd); } -void Channelizer::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void DownChannelizer::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) { if(m_sampleSink == 0) { m_sampleBuffer.clear(); @@ -64,7 +64,7 @@ void Channelizer::feed(const SampleVector::const_iterator& begin, const SampleVe m_sampleBuffer.clear(); } -void Channelizer::start() +void DownChannelizer::start() { if (m_sampleSink != 0) { @@ -76,13 +76,13 @@ void Channelizer::start() } } -void Channelizer::stop() +void DownChannelizer::stop() { if(m_sampleSink != 0) m_sampleSink->stop(); } -bool Channelizer::handleMessage(const Message& cmd) +bool DownChannelizer::handleMessage(const Message& cmd) { qDebug() << "Channelizer::handleMessage: " << cmd.getIdentifier(); @@ -130,7 +130,7 @@ bool Channelizer::handleMessage(const Message& cmd) } } -void Channelizer::applyConfiguration() +void DownChannelizer::applyConfiguration() { if (m_inputSampleRate == 0) { @@ -162,7 +162,7 @@ void Channelizer::applyConfiguration() } } -Channelizer::FilterStage::FilterStage(Mode mode) : +DownChannelizer::FilterStage::FilterStage(Mode mode) : m_filter(new IntHalfbandFilter), m_workFunction(0) { @@ -181,12 +181,12 @@ Channelizer::FilterStage::FilterStage(Mode mode) : } } -Channelizer::FilterStage::~FilterStage() +DownChannelizer::FilterStage::~FilterStage() { delete m_filter; } -bool Channelizer::signalContainsChannel(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) const +bool DownChannelizer::signalContainsChannel(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) const { //qDebug(" testing signal [%f, %f], channel [%f, %f]", sigStart, sigEnd, chanStart, chanEnd); if(sigEnd <= sigStart) @@ -196,7 +196,7 @@ bool Channelizer::signalContainsChannel(Real sigStart, Real sigEnd, Real chanSta return (sigStart <= chanStart) && (sigEnd >= chanEnd); } -Real Channelizer::createFilterChain(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) +Real DownChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real chanStart, Real chanEnd) { Real sigBw = sigEnd - sigStart; Real safetyMargin = sigBw / 20; @@ -235,7 +235,7 @@ Real Channelizer::createFilterChain(Real sigStart, Real sigEnd, Real chanStart, return ofs; } -void Channelizer::freeFilterChain() +void DownChannelizer::freeFilterChain() { for(FilterStages::iterator it = m_filterStages.begin(); it != m_filterStages.end(); ++it) delete *it; diff --git a/sdrbase/dsp/channelizer.h b/sdrbase/dsp/downchannelizer.h similarity index 94% rename from sdrbase/dsp/channelizer.h rename to sdrbase/dsp/downchannelizer.h index a45b21fed..4172ae6e6 100644 --- a/sdrbase/dsp/channelizer.h +++ b/sdrbase/dsp/downchannelizer.h @@ -10,7 +10,7 @@ class MessageQueue; class IntHalfbandFilter; -class SDRANGEL_API Channelizer : public SampleSink { +class SDRANGEL_API DownChannelizer : public SampleSink { Q_OBJECT public: class SDRANGEL_API MsgChannelizerNotification : public Message { @@ -31,8 +31,8 @@ public: qint64 m_frequencyOffset; }; - Channelizer(SampleSink* sampleSink); - virtual ~Channelizer(); + DownChannelizer(SampleSink* sampleSink); + virtual ~DownChannelizer(); void configure(MessageQueue* messageQueue, int sampleRate, int centerFrequency); int getInputSampleRate() const { return m_inputSampleRate; } diff --git a/sdrbase/dsp/dspdeviceengine.cpp b/sdrbase/dsp/dspdeviceengine.cpp index d66c9637c..b9f41725e 100644 --- a/sdrbase/dsp/dspdeviceengine.cpp +++ b/sdrbase/dsp/dspdeviceengine.cpp @@ -15,10 +15,10 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include #include #include "dsp/dspdeviceengine.h" -#include "dsp/channelizer.h" #include "dsp/samplefifo.h" #include "dsp/samplesink.h" #include "dsp/threadedsamplesink.h" diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index 030f5a7a6..792f9b573 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -33,7 +33,7 @@ SOURCES += mainwindow.cpp\ device/deviceapi.cpp\ dsp/afsquelch.cpp\ dsp/agc.cpp\ - dsp/channelizer.cpp\ + dsp/downchannelizer.cpp\ dsp/channelmarker.cpp\ dsp/ctcssdetector.cpp\ dsp/dspcommands.cpp\ @@ -106,7 +106,7 @@ HEADERS += mainwindow.h\ audio/audiooutput.h\ device/deviceapi.h\ dsp/afsquelch.h\ - dsp/channelizer.h\ + dsp/downchannelizer.h\ dsp/channelmarker.h\ dsp/complex.h\ dsp/decimators.h\