Rename EngineBase

src/analyzer/analyzerbase.cpp

@@ -108,8 +108,8 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
   p.fillRect(e->rect(), palette().color(QPalette::Window));
 
   switch (engine_->state()) {
-    case Engine::State::Playing: {
-      const Engine::Scope &thescope = engine_->scope(timeout_);
+    case EngineBase::State::Playing: {
+      const EngineBase::Scope &thescope = engine_->scope(timeout_);
       int i = 0;
 
       // convert to mono here - our built in analyzers need mono, but the engines provide interleaved pcm
@@ -126,7 +126,7 @@ void Analyzer::Base::paintEvent(QPaintEvent *e) {
 
       break;
     }
-    case Engine::State::Paused:
+    case EngineBase::State::Paused:
       is_playing_ = false;
       analyze(p, lastscope_, new_frame_);
       break;

src/analyzer/analyzerbase.h

@@ -39,7 +39,6 @@
 #include <QPainter>
 
 #include "analyzer/fht.h"
-#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
 
 class QHideEvent;

src/analyzer/analyzercontainer.cpp

@@ -44,7 +44,6 @@
 
 #include "core/logging.h"
 #include "engine/enginebase.h"
-#include "engine/enginetype.h"
 
 using namespace std::chrono_literals;
 
@@ -104,7 +103,7 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent)
 
 void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
 
-  if (engine_->type() != Engine::EngineType::GStreamer) {
+  if (engine_->type() != EngineBase::Type::GStreamer) {
     return;
   }
 

src/analyzer/analyzercontainer.h

@@ -30,7 +30,7 @@
 #include <QAction>
 #include <QActionGroup>
 
-#include "engine/engine_fwd.h"
+#include "engine/enginebase.h"
 
 class QTimer;
 class QMouseEvent;

src/analyzer/boomanalyzer.cpp

@@ -32,7 +32,6 @@
 #include <QPalette>
 #include <QColor>
 
-#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
 #include "fht.h"
 #include "analyzerbase.h"
@@ -110,7 +109,7 @@ void BoomAnalyzer::transform(Scope &s) {
 
 void BoomAnalyzer::analyze(QPainter &p, const Scope &scope, const bool new_frame) {
 
-  if (!new_frame || engine_->state() == Engine::State::Paused) {
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
     p.drawPixmap(0, 0, canvas_);
     return;
   }

src/analyzer/sonogram.cpp

@@ -24,6 +24,8 @@
 #include <QPainter>
 #include <QResizeEvent>
 
+#include "engine/enginebase.h"
+
 #include "sonogram.h"
 
 const char *Sonogram::kName = QT_TRANSLATE_NOOP("AnalyzerContainer", "Sonogram");
@@ -42,7 +44,7 @@ void Sonogram::resizeEvent(QResizeEvent *e) {
 
 void Sonogram::analyze(QPainter &p, const Analyzer::Scope &s, bool new_frame) {
 
-  if (!new_frame || engine_->state() == Engine::State::Paused) {
+  if (!new_frame || engine_->state() == EngineBase::State::Paused) {
     p.drawPixmap(0, 0, canvas_);
     return;
   }