From 1b8ad814e58fce978d38262986c75d47d1ea3a72 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 11 Mar 2018 01:00:27 +0100 Subject: [PATCH] DATV demod: header includes cleanup --- plugins/channelrx/demoddatv/datvdemod.h | 18 +++++++----------- plugins/channelrx/demoddatv/datvdemodgui.h | 4 +--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/plugins/channelrx/demoddatv/datvdemod.h b/plugins/channelrx/demoddatv/datvdemod.h index 6718894f7..3c60368ef 100644 --- a/plugins/channelrx/demoddatv/datvdemod.h +++ b/plugins/channelrx/demoddatv/datvdemod.h @@ -47,14 +47,11 @@ class DownChannelizer; #include "datvvideoplayer.h" #include "channel/channelsinkapi.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "dsp/basebandsamplesink.h" +#include "dsp/devicesamplesource.h" +#include "dsp/dspcommands.h" +#include "dsp/downchannelizer.h" +#include "dsp/fftfilt.h" #include "dsp/nco.h" #include "dsp/interpolator.h" #include "dsp/movingaverage.h" @@ -62,11 +59,12 @@ class DownChannelizer; #include "audio/audiofifo.h" #include "util/message.h" #include "util/movingaverage.h" -#include #include "datvideostream.h" #include "datvideorender.h" +#include + enum DATVModulation { BPSK, QPSK, PSK8, APSK16, APSK32, APSK64E, QAM16, QAM64, QAM256 }; enum dvb_version { DVB_S, DVB_S2 }; enum dvb_sampler { SAMP_NEAREST, SAMP_LINEAR, SAMP_RRC }; @@ -457,8 +455,6 @@ private: DATVModulation m_enmModulation; - //QElapsedTimer m_objTimer; - DATVConfig m_objRunning; MovingAverageUtil m_objMagSqAverage; diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index d16db6c2e..e6fad2764 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -20,14 +20,12 @@ #define INCLUDE_DATVDEMODGUI_H #include "gui/rollupwidget.h" -#include +#include "plugin/plugininstancegui.h" #include "dsp/channelmarker.h" #include "dsp/movingaverage.h" #include "datvdemod.h" -#include -#include #include