From 71cb65ca6643bfdd9a9f3833f5599a4acd00b36c Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 10 Dec 2018 00:52:05 +0100 Subject: [PATCH] Channel Analyzer: do not forward messages to scope and spectrum vis combo since it is better done through the GUI --- plugins/channelrx/chanalyzer/chanalyzer.cpp | 18 ++++++++++-------- plugins/channelrx/chanalyzer/chanalyzergui.cpp | 10 +++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index a8ad3871e..e46489bcd 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -219,14 +219,16 @@ bool ChannelAnalyzer::handleMessage(const Message& cmd) } else { - if (m_sampleSink != 0) - { - return m_sampleSink->handleMessage(cmd); - } - else - { - return false; - } + // Processed through GUI +// if (m_sampleSink != 0) +// { +// return m_sampleSink->handleMessage(cmd); +// } +// else +// { +// return false; +// } + return false; } } diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 613b4891f..7dacefda2 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -14,25 +14,25 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include -#include "device/deviceuiset.h" -#include #include #include +#include "device/devicesourceapi.h" +#include "device/deviceuiset.h" +#include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" -#include "ui_chanalyzergui.h" #include "dsp/spectrumscopecombovis.h" #include "dsp/spectrumvis.h" +#include "dsp/dspengine.h" #include "gui/glspectrum.h" #include "gui/glscope.h" #include "gui/basicchannelsettingsdialog.h" #include "plugin/pluginapi.h" #include "util/simpleserializer.h" #include "util/db.h" -#include "dsp/dspengine.h" #include "mainwindow.h" +#include "ui_chanalyzergui.h" #include "chanalyzer.h" #include "chanalyzergui.h"