VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

RxTx semantic move: renamed Channelizer to DownChannelizer

Browse Source
This commit is contained in:
f4exb 2016-10-02 21:52:39 +02:00
parent 1f7df6548a
commit 20c6fb19cc
35 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

6
plugins/channelrx/chanalyzer/chanalyzer.cpp
View File

@ -16,11 +16,11 @@
#include "../../channelrx/chanalyzer/chanalyzer.h"
#include <dsp/downchannelizer.h>
#include <QTime>
#include <QDebug>
#include <stdio.h>
#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);

4
plugins/channelrx/chanalyzer/chanalyzergui.cpp
View File

@ -16,11 +16,11 @@
#include "../../channelrx/chanalyzer/chanalyzergui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#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);

4
plugins/channelrx/chanalyzer/chanalyzergui.h
View File

@ -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<Real> m_channelPowerDbAvg;
ThreadedSampleSink* m_threadedChannelizer;
Channelizer* m_channelizer;
DownChannelizer* m_channelizer;
ChannelAnalyzer* m_channelAnalyzer;
SpectrumScopeComboVis* m_spectrumScopeComboVis;
SpectrumVis* m_spectrumVis;

6
plugins/channelrx/demodam/amdemod.cpp
View File

@ -20,9 +20,9 @@
#include <QDebug>
#include <stdio.h>
#include <complex.h>
#include <dsp/downchannelizer.h>
#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();

4
plugins/channelrx/demodam/amdemodgui.cpp
View File

@ -1,10 +1,10 @@
#include "../../channelrx/demodam/amdemodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#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);

4
plugins/channelrx/demodam/amdemodgui.h
View File

@ -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<Real> m_channelPowerDbAvg;
bool m_squelchOpen;

7
plugins/channelrx/demodbfm/bfmdemod.cpp
View File

@ -23,10 +23,11 @@
#include <complex.h>
#include "audio/audiooutput.h"
#include "dsp/dspengine.h"
#include "dsp/channelizer.h"
#include "dsp/pidcontroller.h"
#include "bfmdemod.h"
#include <dsp/downchannelizer.h>
#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();

4
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -17,6 +17,7 @@
#include "../../channelrx/demodbfm/bfmdemodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#include <QDebug>
@ -26,7 +27,6 @@
#include <iomanip>
#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);

4
plugins/channelrx/demodbfm/bfmdemodgui.h
View File

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

6
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -21,8 +21,8 @@
#include <QDebug>
#include <stdio.h>
#include <complex.h>
#include <dsp/downchannelizer.h>
#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();

4
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -17,12 +17,12 @@
#include "../../channelrx/demoddsd/dsddemodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#include <QDebug>
#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);

4
plugins/channelrx/demoddsd/dsddemodgui.h
View File

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

7
plugins/channelrx/demodlora/lorademod.cpp
View File

@ -18,11 +18,10 @@
#include "../../channelrx/demodlora/lorademod.h"
#include <dsp/downchannelizer.h>
#include <QTime>
#include <QDebug>
#include <stdio.h>
#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();

4
plugins/channelrx/demodlora/lorademodgui.cpp
View File

@ -1,12 +1,12 @@
#include "../../channelrx/demodlora/lorademodgui.h"
#include "../../channelrx/demodlora/lorademodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#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);

4
plugins/channelrx/demodlora/lorademodgui.h
View File

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

6
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -21,8 +21,8 @@
#include <QDebug>
#include <stdio.h>
#include <complex.h>
#include <dsp/downchannelizer.h>
#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();

4
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -1,11 +1,11 @@
#include "../../channelrx/demodnfm/nfmdemodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#include <QDebug>
#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);

4
plugins/channelrx/demodnfm/nfmdemodgui.h
View File

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

6
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -18,12 +18,12 @@
#include "../../channelrx/demodssb/ssbdemod.h"
#include <dsp/downchannelizer.h>
#include <QTime>
#include <QDebug>
#include <stdio.h>
#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();

4
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -1,12 +1,12 @@
#include "../../channelrx/demodssb/ssbdemodgui.h"
#include "../../channelrx/demodssb/ssbdemodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#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);

4
plugins/channelrx/demodssb/ssbdemodgui.h
View File

@ -11,7 +11,7 @@ class DeviceAPI;
class AudioFifo;
class ThreadedSampleSink;
class Channelizer;
class DownChannelizer;
class SSBDemod;
class SpectrumVis;
@ -71,7 +71,7 @@ private:
MovingAverage<Real> m_channelPowerDbAvg;
ThreadedSampleSink* m_threadedChannelizer;
Channelizer* m_channelizer;
DownChannelizer* m_channelizer;
SSBDemod* m_ssbDemod;
SpectrumVis* m_spectrumVis;

6
plugins/channelrx/demodwfm/wfmdemod.cpp
View File

@ -21,9 +21,9 @@
#include <QDebug>
#include <stdio.h>
#include <complex.h>
#include <dsp/downchannelizer.h>
#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();

4
plugins/channelrx/demodwfm/wfmdemodgui.cpp
View File

@ -1,11 +1,11 @@
#include "../../channelrx/demodwfm/wfmdemodgui.h"
#include <dsp/downchannelizer.h>
#include <QDockWidget>
#include <QMainWindow>
#include <QDebug>
#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);

4
plugins/channelrx/demodwfm/wfmdemodgui.h
View File

@ -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<Real> m_channelPowerDbAvg;

6
plugins/channelrx/tcpsrc/tcpsrc.cpp
View File

@ -16,10 +16,10 @@
#include "../../channelrx/tcpsrc/tcpsrc.h"
#include <dsp/downchannelizer.h>
#include <QTcpServer>
#include <QTcpSocket>
#include <QThread>
#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();

4
plugins/channelrx/tcpsrc/tcpsrcgui.cpp
View File

@ -1,9 +1,9 @@
#include "../../channelrx/tcpsrc/tcpsrcgui.h"
#include <dsp/downchannelizer.h>
#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);

4
plugins/channelrx/tcpsrc/tcpsrcgui.h
View File

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

6
plugins/channelrx/udpsrc/udpsrc.cpp
View File

@ -17,10 +17,10 @@
#include "../../channelrx/udpsrc/udpsrc.h"
#include <dsp/downchannelizer.h>
#include <QUdpSocket>
#include <QThread>
#include <QHostAddress>
#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();

4
plugins/channelrx/udpsrc/udpsrcgui.cpp
View File

@ -17,10 +17,10 @@
#include "../../channelrx/udpsrc/udpsrcgui.h"
#include <dsp/downchannelizer.h>
#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);

4
plugins/channelrx/udpsrc/udpsrcgui.h
View File

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

30
sdrbase/dsp/channelizer.cpp → sdrbase/dsp/downchannelizer.cpp
View File

@ -1,13 +1,13 @@
#include "dsp/channelizer.h"
#include <dsp/downchannelizer.h>
#include "dsp/inthalfbandfilter.h"
#include "dsp/dspcommands.h"
#include <QString>
#include <QDebug>
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;

6
sdrbase/dsp/channelizer.h → sdrbase/dsp/downchannelizer.h
View File

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

2
sdrbase/dsp/dspdeviceengine.cpp
View File

@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <dsp/downchannelizer.h>
#include <stdio.h>
#include <QDebug>
#include "dsp/dspdeviceengine.h"
#include "dsp/channelizer.h"
#include "dsp/samplefifo.h"
#include "dsp/samplesink.h"
#include "dsp/threadedsamplesink.h"

4
sdrbase/sdrbase.pro
View File

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