Remove engine type
This commit is contained in:
parent
218dd439b6
commit
f9f47458d5
@ -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());
|
||||
}
|
||||
|
@ -102,7 +102,6 @@ void RegisterMetaTypes() {
|
||||
qRegisterMetaType<SongMap>("SongMap");
|
||||
qRegisterMetaType<Song::Source>("Song::Source");
|
||||
qRegisterMetaType<Song::FileType>("Song::FileType");
|
||||
qRegisterMetaType<EngineBase::Type>("EngineBase::Type");
|
||||
qRegisterMetaType<EngineBase::State>("EngineBase::State");
|
||||
qRegisterMetaType<EngineBase::TrackChangeFlags>("EngineBase::TrackChangeFlags");
|
||||
qRegisterMetaType<EngineBase::OutputDetails>("EngineBase::OutputDetails");
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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<double> ebur128_integrated_loudness_lufs) {
|
||||
|
||||
Q_UNUSED(track_change_flags)
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include <QString>
|
||||
#include <QUrl>
|
||||
|
||||
#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<int16_t>;
|
||||
|
||||
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)
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user