From 14a21b10cb8ca07d7acf6c612b94175fa6bcf71f Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 13 Dec 2019 00:40:20 +0100 Subject: [PATCH] Removed obsolete references to DownChannelizr --- plugins/channelrx/chanalyzer/chanalyzer.cpp | 1 - .../channelrx/chanalyzer/chanalyzergui.cpp | 1 - plugins/channelrx/demodam/amdemodgui.cpp | 1 - plugins/channelrx/demodatv/atvdemod.cpp | 1 - plugins/channelrx/demodatv/atvdemod.h | 1 - plugins/channelrx/demodatv/atvdemodgui.cpp | 2 -- plugins/channelrx/demodbfm/bfmdemodgui.cpp | 1 - plugins/channelrx/demoddatv/datvdemodgui.cpp | 1 - plugins/channelrx/demoddatv/datvdemodsink.cpp | 1 - plugins/channelrx/demoddsd/dsddemodgui.cpp | 1 - plugins/channelrx/demodlora/lorademod.cpp | 1 - plugins/channelrx/demodlora/lorademodgui.cpp | 1 - plugins/channelrx/demodssb/ssbdemod.cpp | 1 - plugins/channelrx/demodwfm/wfmdemod.cpp | 1 - plugins/channelrx/demodwfm/wfmdemodgui.cpp | 1 - plugins/channelrx/freqtracker/freqtracker.cpp | 1 - .../channelrx/freqtracker/freqtrackergui.cpp | 1 - plugins/channelrx/localsink/localsink.cpp | 1 - plugins/channelrx/udpsink/udpsink.cpp | 1 - sdrbase/dsp/downsamplechannelizer.cpp | 22 +++++++++---------- 20 files changed, 11 insertions(+), 31 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index 96ff80006..c8cc07706 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -23,7 +23,6 @@ #include "device/deviceapi.h" #include "audio/audiooutput.h" -#include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" #include "chanalyzer.h" diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 5599e6f18..ee9e1e3dd 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -19,7 +19,6 @@ #include #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" #include "dsp/spectrumscopecombovis.h" #include "dsp/spectrumvis.h" #include "dsp/dspengine.h" diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 523bb4a79..6264bc905 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -23,7 +23,6 @@ #include "amdemodssbdialog.h" #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" #include "dsp/dspengine.h" #include "ui_amdemodgui.h" #include "plugin/pluginapi.h" diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index 128133cde..ed471b17a 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -24,7 +24,6 @@ #include #include "dsp/dspengine.h" -#include "dsp/downchannelizer.h" #include "device/deviceapi.h" #include "atvdemod.h" diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index 95b9fe099..94f137209 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -26,7 +26,6 @@ #include "channel/channelapi.h" #include "dsp/devicesamplesource.h" #include "dsp/dspcommands.h" -#include "dsp/downchannelizer.h" #include "util/message.h" #include "atvdemodbaseband.h" diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 832c59994..01c0d4386 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -22,8 +22,6 @@ #include "atvdemodgui.h" #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" - #include "dsp/scopevis.h" #include "ui_atvdemodgui.h" #include "plugin/pluginapi.h" diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index c7414c26f..b582ff5c2 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -19,7 +19,6 @@ #include "bfmdemodgui.h" #include "device/deviceuiset.h" -#include #include #include #include diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index a1bdeb7ac..014ac85f5 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -22,7 +22,6 @@ #include #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" #include "dsp/dspengine.h" #include "plugin/pluginapi.h" #include "util/simpleserializer.h" diff --git a/plugins/channelrx/demoddatv/datvdemodsink.cpp b/plugins/channelrx/demoddatv/datvdemodsink.cpp index 7b08a3bea..0d53dd783 100644 --- a/plugins/channelrx/demoddatv/datvdemodsink.cpp +++ b/plugins/channelrx/demoddatv/datvdemodsink.cpp @@ -24,7 +24,6 @@ #include "audio/audiooutput.h" #include "dsp/dspengine.h" -#include "dsp/downchannelizer.h" #include "device/deviceapi.h" #include "datvdemodreport.h" diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 213bd9179..4058f9604 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -19,7 +19,6 @@ #include "dsddemodgui.h" #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" #include "ui_dsddemodgui.h" #include "dsp/scopevisxy.h" diff --git a/plugins/channelrx/demodlora/lorademod.cpp b/plugins/channelrx/demodlora/lorademod.cpp index 758f0cdd0..fadc006bb 100644 --- a/plugins/channelrx/demodlora/lorademod.cpp +++ b/plugins/channelrx/demodlora/lorademod.cpp @@ -23,7 +23,6 @@ #include #include -#include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" #include "device/deviceapi.h" diff --git a/plugins/channelrx/demodlora/lorademodgui.cpp b/plugins/channelrx/demodlora/lorademodgui.cpp index 72ee1d61d..f08cc493b 100644 --- a/plugins/channelrx/demodlora/lorademodgui.cpp +++ b/plugins/channelrx/demodlora/lorademodgui.cpp @@ -1,6 +1,5 @@ #include "device/deviceuiset.h" -#include #include #include diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 04bd86368..272088771 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -33,7 +33,6 @@ #include "SWGSSBDemodReport.h" #include "dsp/dspengine.h" -#include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" #include "dsp/devicesamplemimo.h" #include "device/deviceapi.h" diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index 5d0d62e8b..8d7835352 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -32,7 +32,6 @@ #include "SWGChannelReport.h" #include "SWGWFMDemodReport.h" -#include #include "device/deviceapi.h" #include "audio/audiooutput.h" #include "dsp/dspengine.h" diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index d365f4619..afb7aebb2 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -1,7 +1,6 @@ #include "wfmdemodgui.h" #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" #include #include diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp index 221014168..2731ffa9f 100644 --- a/plugins/channelrx/freqtracker/freqtracker.cpp +++ b/plugins/channelrx/freqtracker/freqtracker.cpp @@ -33,7 +33,6 @@ #include "SWGChannelReport.h" #include "SWGFreqTrackerReport.h" -#include "dsp/downchannelizer.h" #include "audio/audiooutput.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp index 7944115f1..3637e2fef 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.cpp +++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp @@ -22,7 +22,6 @@ #include "freqtrackergui.h" #include "device/deviceuiset.h" -#include "dsp/downchannelizer.h" #include "dsp/dspengine.h" #include "dsp/dspcommands.h" #include "ui_freqtrackergui.h" diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp index 162d0edc8..25d801e9b 100644 --- a/plugins/channelrx/localsink/localsink.cpp +++ b/plugins/channelrx/localsink/localsink.cpp @@ -26,7 +26,6 @@ #include "SWGChannelSettings.h" #include "util/simpleserializer.h" -#include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" #include "dsp/dspdevicesourceengine.h" #include "dsp/dspengine.h" diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp index a146b8b13..9fae9b9b1 100644 --- a/plugins/channelrx/udpsink/udpsink.cpp +++ b/plugins/channelrx/udpsink/udpsink.cpp @@ -30,7 +30,6 @@ #include "dsp/dspengine.h" #include "util/db.h" -#include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" #include "dsp/devicesamplemimo.h" #include "device/deviceapi.h" diff --git a/sdrbase/dsp/downsamplechannelizer.cpp b/sdrbase/dsp/downsamplechannelizer.cpp index 20f0790c2..d26a858de 100644 --- a/sdrbase/dsp/downsamplechannelizer.cpp +++ b/sdrbase/dsp/downsamplechannelizer.cpp @@ -127,7 +127,7 @@ void DownSampleChannelizer::applyChannelization() m_channelSampleRate = m_basebandSampleRate / (1 << m_filterStages.size()); - qDebug() << "DownChannelizer::applyChannelization done:" + qDebug() << "DownSampleChannelizer::applyChannelization done:" << " in (baseband):" << m_basebandSampleRate << " req:" << m_requestedOutputSampleRate << " out (channel):" << m_channelSampleRate @@ -226,12 +226,12 @@ Real DownSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real c Real sigBw = sigEnd - sigStart; Real rot = sigBw / 4; - //qDebug("DownChannelizer::createFilterChain: Signal [%.1f, %.1f] (BW %.1f), Channel [%.1f, %.1f], Rot %.1f", sigStart, sigEnd, sigBw, chanStart, chanEnd, rot); + //qDebug("DownSampleChannelizer::createFilterChain: Signal [%.1f, %.1f] (BW %.1f), Channel [%.1f, %.1f], Rot %.1f", sigStart, sigEnd, sigBw, chanStart, chanEnd, rot); // check if it fits into the left half if(signalContainsChannel(sigStart, sigStart + sigBw / 2.0, chanStart, chanEnd)) { - //qDebug("DownChannelizer::createFilterChain: -> take left half (rotate by +1/4 and decimate by 2)"); + //qDebug("DownSampleChannelizer::createFilterChain: -> take left half (rotate by +1/4 and decimate by 2)"); m_filterStages.push_back(new FilterStage(FilterStage::ModeLowerHalf)); return createFilterChain(sigStart, sigStart + sigBw / 2.0, chanStart, chanEnd); } @@ -239,7 +239,7 @@ Real DownSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real c // check if it fits into the right half if(signalContainsChannel(sigEnd - sigBw / 2.0f, sigEnd, chanStart, chanEnd)) { - //qDebug("DownChannelizer::createFilterChain: -> take right half (rotate by -1/4 and decimate by 2)"); + //qDebug("DownSampleChannelizer::createFilterChain: -> take right half (rotate by -1/4 and decimate by 2)"); m_filterStages.push_back(new FilterStage(FilterStage::ModeUpperHalf)); return createFilterChain(sigEnd - sigBw / 2.0f, sigEnd, chanStart, chanEnd); } @@ -247,13 +247,13 @@ Real DownSampleChannelizer::createFilterChain(Real sigStart, Real sigEnd, Real c // check if it fits into the center if(signalContainsChannel(sigStart + rot, sigEnd - rot, chanStart, chanEnd)) { - //qDebug("DownChannelizer::createFilterChain: -> take center half (decimate by 2)"); + //qDebug("DownSampleChannelizer::createFilterChain: -> take center half (decimate by 2)"); m_filterStages.push_back(new FilterStage(FilterStage::ModeCenter)); return createFilterChain(sigStart + rot, sigEnd - rot, chanStart, chanEnd); } Real ofs = ((chanEnd - chanStart) / 2.0 + chanStart) - ((sigEnd - sigStart) / 2.0 + sigStart); - //qDebug("DownChannelizer::createFilterChain: -> complete (final BW %.1f, frequency offset %.1f)", sigBw, ofs); + //qDebug("DownSampleChannelizer::createFilterChain: -> complete (final BW %.1f, frequency offset %.1f)", sigBw, ofs); return ofs; } @@ -299,23 +299,23 @@ void DownSampleChannelizer::freeFilterChain() void DownSampleChannelizer::debugFilterChain() { - qDebug("DownChannelizer::debugFilterChain: %lu stages", m_filterStages.size()); + qDebug("DownSampleChannelizer::debugFilterChain: %lu stages", m_filterStages.size()); for(FilterStages::iterator it = m_filterStages.begin(); it != m_filterStages.end(); ++it) { switch ((*it)->m_mode) { case FilterStage::ModeCenter: - qDebug("DownChannelizer::debugFilterChain: center %s", (*it)->m_sse ? "sse" : "no_sse"); + qDebug("DownSampleChannelizer::debugFilterChain: center %s", (*it)->m_sse ? "sse" : "no_sse"); break; case FilterStage::ModeLowerHalf: - qDebug("DownChannelizer::debugFilterChain: lower %s", (*it)->m_sse ? "sse" : "no_sse"); + qDebug("DownSampleChannelizer::debugFilterChain: lower %s", (*it)->m_sse ? "sse" : "no_sse"); break; case FilterStage::ModeUpperHalf: - qDebug("DownChannelizer::debugFilterChain: upper %s", (*it)->m_sse ? "sse" : "no_sse"); + qDebug("DownSampleChannelizer::debugFilterChain: upper %s", (*it)->m_sse ? "sse" : "no_sse"); break; default: - qDebug("DownChannelizer::debugFilterChain: none %s", (*it)->m_sse ? "sse" : "no_sse"); + qDebug("DownSampleChannelizer::debugFilterChain: none %s", (*it)->m_sse ? "sse" : "no_sse"); break; } }