From 154da7b5c0615329fe40a47e3eb56d001da76600 Mon Sep 17 00:00:00 2001 From: narunlifescience Date: Mon, 23 Nov 2015 12:48:22 -0600 Subject: [PATCH] Fix boom analyzer, terbine & bar analyzer behaviour when paused remove hidden file added --- src/analyzers/analyzerbase.cpp | 1 - src/analyzers/analyzerbase.h | 1 + src/analyzers/baranalyzer.cpp | 2 +- src/analyzers/boomanalyzer.cpp | 2 +- src/analyzers/sonogram.h | 1 - src/analyzers/turbine.cpp | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/analyzers/analyzerbase.cpp b/src/analyzers/analyzerbase.cpp index 71c0b7ff0..20cb3a62e 100644 --- a/src/analyzers/analyzerbase.cpp +++ b/src/analyzers/analyzerbase.cpp @@ -32,7 +32,6 @@ #include #include -#include "engines/enginebase.h" #include "core/arraysize.h" // INSTRUCTIONS Base2D diff --git a/src/analyzers/analyzerbase.h b/src/analyzers/analyzerbase.h index 73895caee..37ef3c4e9 100644 --- a/src/analyzers/analyzerbase.h +++ b/src/analyzers/analyzerbase.h @@ -32,6 +32,7 @@ #include "fht.h" #include "engines/engine_fwd.h" +#include "engines/enginebase.h" #include #include #include diff --git a/src/analyzers/baranalyzer.cpp b/src/analyzers/baranalyzer.cpp index 3992227c9..237b3eea9 100644 --- a/src/analyzers/baranalyzer.cpp +++ b/src/analyzers/baranalyzer.cpp @@ -121,7 +121,7 @@ void BarAnalyzer::psychedelicModeChanged(bool enabled) { } void BarAnalyzer::analyze(QPainter& p, const Scope& s, bool new_frame) { - if (!new_frame) { + if (!new_frame || engine_->state() == Engine::Paused) { p.drawPixmap(0, 0, canvas_); return; } diff --git a/src/analyzers/boomanalyzer.cpp b/src/analyzers/boomanalyzer.cpp index 93df2e48a..a0a757a68 100644 --- a/src/analyzers/boomanalyzer.cpp +++ b/src/analyzers/boomanalyzer.cpp @@ -103,7 +103,7 @@ void BoomAnalyzer::transform(Scope& s) { } void BoomAnalyzer::analyze(QPainter& p, const Scope& scope, bool new_frame) { - if (!new_frame) { + if (!new_frame || engine_->state() == Engine::Paused) { p.drawPixmap(0, 0, canvas_); return; } diff --git a/src/analyzers/sonogram.h b/src/analyzers/sonogram.h index 7c1b96c08..7588c5264 100644 --- a/src/analyzers/sonogram.h +++ b/src/analyzers/sonogram.h @@ -26,7 +26,6 @@ #define ANALYZERS_SONOGRAM_H_ #include "analyzerbase.h" -#include "engines/enginebase.h" class Sonogram : public Analyzer::Base { Q_OBJECT diff --git a/src/analyzers/turbine.cpp b/src/analyzers/turbine.cpp index 0572bc270..e143626e0 100644 --- a/src/analyzers/turbine.cpp +++ b/src/analyzers/turbine.cpp @@ -35,7 +35,7 @@ const char* TurbineAnalyzer::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Turbine"); void TurbineAnalyzer::analyze(QPainter& p, const Scope& scope, bool new_frame) { - if (!new_frame) { + if (!new_frame || engine_->state() == Engine::Paused) { p.drawPixmap(0, 0, canvas_); return; }