diff --git a/src/analyzer/analyzercontainer.cpp b/src/analyzer/analyzercontainer.cpp index 1b4c33cb7..ad25ad68e 100644 --- a/src/analyzer/analyzercontainer.cpp +++ b/src/analyzer/analyzercontainer.cpp @@ -112,10 +112,6 @@ AnalyzerContainer::AnalyzerContainer(QWidget *parent) void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) { - if (engine_->type() != EngineBase::Type::GStreamer) { - return; - } - if (e->button() == Qt::RightButton) { context_menu_->popup(e->globalPosition().toPoint()); } diff --git a/src/core/metatypes.cpp b/src/core/metatypes.cpp index 551fe3087..2fbe15402 100644 --- a/src/core/metatypes.cpp +++ b/src/core/metatypes.cpp @@ -102,7 +102,6 @@ void RegisterMetaTypes() { qRegisterMetaType("SongMap"); qRegisterMetaType("Song::Source"); qRegisterMetaType("Song::FileType"); - qRegisterMetaType("EngineBase::Type"); qRegisterMetaType("EngineBase::State"); qRegisterMetaType("EngineBase::TrackChangeFlags"); qRegisterMetaType("EngineBase::OutputDetails"); diff --git a/src/core/player.h b/src/core/player.h index dc0c6d12a..801f07dd1 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -106,9 +106,6 @@ class Player : public PlayerInterface { void HandleAuthentication(); - Q_SIGNALS: - void EngineChanged(const EngineBase::Type Type); - private Q_SLOTS: void UrlHandlerRegistered(UrlHandler *url_handler) const; diff --git a/src/engine/enginebase.cpp b/src/engine/enginebase.cpp index 54bf18597..c817aa776 100644 --- a/src/engine/enginebase.cpp +++ b/src/engine/enginebase.cpp @@ -84,34 +84,6 @@ EngineBase::EngineBase(QObject *parent) EngineBase::~EngineBase() = default; -EngineBase::Type EngineBase::TypeFromName(const QString &name) { - - if (name.compare("gstreamer"_L1, Qt::CaseInsensitive) == 0) return Type::GStreamer; - - return Type::None; - -} - -QString EngineBase::Name(const Type type) { - - switch (type) { - case Type::GStreamer: return u"gstreamer"_s; - case Type::None: - default: return u"None"_s; - } - -} - -QString EngineBase::Description(const Type type) { - - switch (type) { - case Type::GStreamer: return u"GStreamer"_s; - case Type::None: - default: return u"None"_s; - } - -} - bool EngineBase::Load(const QUrl &media_url, const QUrl &stream_url, const TrackChangeFlags track_change_flags, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec, const std::optional ebur128_integrated_loudness_lufs) { Q_UNUSED(track_change_flags) diff --git a/src/engine/enginebase.h b/src/engine/enginebase.h index 796a1fd60..29455b8e2 100644 --- a/src/engine/enginebase.h +++ b/src/engine/enginebase.h @@ -38,7 +38,6 @@ #include #include -#include "devicefinders.h" #include "core/enginemetadata.h" #include "core/song.h" @@ -51,13 +50,6 @@ class EngineBase : public QObject { public: ~EngineBase() override; - enum class Type { - None, - GStreamer, - VLC, - Xine - }; - // State: // Playing when playing, // Paused when paused @@ -96,11 +88,6 @@ class EngineBase : public QObject { using Scope = std::vector; - static Type TypeFromName(const QString &name); - static QString Name(const Type type); - static QString Description(const Type type); - - virtual Type type() const = 0; virtual bool Init() = 0; virtual State state() const = 0; virtual void StartPreloading(const QUrl&, const QUrl&, const bool, const qint64, const qint64) {} @@ -257,7 +244,6 @@ class EngineBase : public QObject { Q_DISABLE_COPY(EngineBase) }; -Q_DECLARE_METATYPE(EngineBase::Type) Q_DECLARE_METATYPE(EngineBase::State) Q_DECLARE_METATYPE(EngineBase::TrackChangeType) Q_DECLARE_METATYPE(EngineBase::OutputDetails) diff --git a/src/engine/gstengine.h b/src/engine/gstengine.h index b76eea5fd..f86e2a022 100644 --- a/src/engine/gstengine.h +++ b/src/engine/gstengine.h @@ -58,7 +58,6 @@ class GstEngine : public EngineBase, public GstBufferConsumer { static const char *kAutoSink; static const char *kALSASink; - Type type() const override { return Type::GStreamer; } bool Init() override; State state() const override; void StartPreloading(const QUrl &media_url, const QUrl &stream_url, const bool force_stop_at_end, const qint64 beginning_nanosec, const qint64 end_nanosec) override;