dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use override

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-15 21:55:05 +02:00
parent 72ede666d4
commit 651020388d
271 changed files with 1199 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/alsadevicefinder.h
View File

@@ -30,8 +30,8 @@ class AlsaDeviceFinder : public DeviceFinder {
public:
explicit AlsaDeviceFinder();
virtual bool Initialise() { return true; }
virtual QList<Device> ListDevices();
bool Initialise() override { return true; }
QList<Device> ListDevices() override;
};
#endif // ALSADEVICEFINDER_H

2
src/engine/devicefinders.h
View File

@@ -33,7 +33,7 @@ class DeviceFinders : public QObject {
public:
explicit DeviceFinders(QObject *parent = nullptr);
~DeviceFinders();
~DeviceFinders() override;
void Init();
QList<DeviceFinder*> ListFinders() { return device_finders_; }

2
src/engine/enginebase.h
View File

@@ -57,7 +57,7 @@ protected:
public:
virtual ~Base();
~Base() override;
struct OutputDetails {
QString name;

52
src/engine/gstengine.h
View File

@@ -58,58 +58,58 @@ class GstEngine : public Engine::Base, public GstBufferConsumer {
public:
explicit GstEngine(TaskManager *task_manager);
~GstEngine();
~GstEngine() override;
bool Init();
Engine::State state() const;
void StartPreloading(const QUrl &stream_url, const QUrl &original_url, const bool force_stop_at_end, const qint64 beginning_nanosec, const qint64 end_nanosec);
bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec);
bool Play(const quint64 offset_nanosec);
void Stop(const bool stop_after = false);
void Pause();
void Unpause();
void Seek(const quint64 offset_nanosec);
bool Init() override;
Engine::State state() const override;
void StartPreloading(const QUrl &stream_url, const QUrl &original_url, const bool force_stop_at_end, const qint64 beginning_nanosec, const qint64 end_nanosec) override;
bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec) override;
bool Play(const quint64 offset_nanosec) override;
void Stop(const bool stop_after = false) override;
void Pause() override;
void Unpause() override;
void Seek(const quint64 offset_nanosec) override;
protected:
void SetVolumeSW(const uint percent);
void SetVolumeSW(const uint percent) override;
public:
qint64 position_nanosec() const;
qint64 length_nanosec() const;
const Engine::Scope &scope(const int chunk_length);
qint64 position_nanosec() const override;
qint64 length_nanosec() const override;
const Engine::Scope &scope(const int chunk_length) override;
OutputDetailsList GetOutputsList() const;
bool ValidOutput(const QString &output);
QString DefaultOutput() { return kAutoSink; }
bool CustomDeviceSupport(const QString &output);
bool ALSADeviceSupport(const QString &output);
OutputDetailsList GetOutputsList() const override;
bool ValidOutput(const QString &output) override;
QString DefaultOutput() override { return kAutoSink; }
bool CustomDeviceSupport(const QString &output) override;
bool ALSADeviceSupport(const QString &output) override;
void SetStartup(GstStartup *gst_startup) { gst_startup_ = gst_startup; }
void EnsureInitialised() { gst_startup_->EnsureInitialised(); }
GstElement *CreateElement(const QString &factoryName, GstElement *bin = nullptr, const bool showerror = true);
void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format);
void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format) override;
public slots:
void ReloadSettings();
void ReloadSettings() override;
// Set whether stereo balancer is enabled
void SetStereoBalancerEnabled(const bool enabled);
void SetStereoBalancerEnabled(const bool enabled) override;
// Set Stereo balance, range -1.0f..1.0f
void SetStereoBalance(const float value);
void SetStereoBalance(const float value) override;
// Set whether equalizer is enabled
void SetEqualizerEnabled(const bool);
void SetEqualizerEnabled(const bool) override;
// Set equalizer preamp and gains, range -100..100. Gains are 10 values.
void SetEqualizerParameters(const int preamp, const QList<int> &band_gains);
void SetEqualizerParameters(const int preamp, const QList<int> &band_gains) override;
void AddBufferConsumer(GstBufferConsumer *consumer);
void RemoveBufferConsumer(GstBufferConsumer *consumer);
protected:
void timerEvent(QTimerEvent*);
void timerEvent(QTimerEvent *e) override;
private slots:
void EndOfStreamReached(const int pipeline_id, const bool has_next_track);

4
src/engine/gstenginepipeline.h
View File

@@ -59,7 +59,7 @@ class GstEnginePipeline : public QObject {
public:
explicit GstEnginePipeline(GstEngine *engine);
~GstEnginePipeline();
~GstEnginePipeline() override;
// Globally unique across all pipelines.
int id() const { return id_; }
@@ -132,7 +132,7 @@ class GstEnginePipeline : public QObject {
void BufferingFinished();
protected:
void timerEvent(QTimerEvent*);
void timerEvent(QTimerEvent*) override;
private:
bool InitAudioBin();

2
src/engine/gststartup.h
View File

@@ -32,7 +32,7 @@ class GstStartup : public QObject {
public:
explicit GstStartup(QObject *parent = nullptr);
~GstStartup();
~GstStartup() override;
void EnsureInitialised() { initialising_.waitForFinished(); }

38
src/engine/vlcengine.h
View File

@@ -43,27 +43,29 @@ class VLCEngine : public Engine::Base {
public:
explicit VLCEngine(TaskManager *task_manager);
~VLCEngine();
~VLCEngine() override;
bool Init() override;
Engine::State state() const override { return state_; }
bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec) override;
bool Play(const quint64 offset_nanosec) override;
void Stop(const bool stop_after = false) override;
void Pause() override;
void Unpause() override;
void Seek(const quint64 offset_nanosec) override;
bool Init();
Engine::State state() const { return state_; }
bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec);
bool Play(const quint64 offset_nanosec);
void Stop(const bool stop_after = false);
void Pause();
void Unpause();
void Seek(const quint64 offset_nanosec);
protected:
void SetVolumeSW(const uint percent);
public:
virtual qint64 position_nanosec() const;
virtual qint64 length_nanosec() const;
void SetVolumeSW(const uint percent) override;
OutputDetailsList GetOutputsList() const;
bool ValidOutput(const QString &output);
QString DefaultOutput() { return ""; }
bool CustomDeviceSupport(const QString &output);
bool ALSADeviceSupport(const QString &output);
public:
qint64 position_nanosec() const override;
qint64 length_nanosec() const override;
OutputDetailsList GetOutputsList() const override;
bool ValidOutput(const QString &output) override;
QString DefaultOutput() override { return ""; }
bool CustomDeviceSupport(const QString &output) override;
bool ALSADeviceSupport(const QString &output) override;
private:
libvlc_instance_t *instance_;

40
src/engine/xineengine.h
View File

@@ -47,37 +47,37 @@ class XineEngine : public Engine::Base {
public:
explicit XineEngine(TaskManager *task_manager);
~XineEngine();
~XineEngine() override;
bool Init();
Engine::State state() const;
bool Load(const QUrl &stream_url, const QUrl &original_url, Engine::TrackChangeFlags change, bool force_stop_at_end, quint64 beginning_nanosec, qint64 end_nanosec);
bool Play(quint64 offset_nanosec);
void Stop(bool stop_after = false);
void Pause();
void Unpause();
void Seek(quint64 offset_nanosec);
void SetVolumeSW(uint );
bool Init() override;
Engine::State state() const override;
bool Load(const QUrl &stream_url, const QUrl &original_url, Engine::TrackChangeFlags change, bool force_stop_at_end, quint64 beginning_nanosec, qint64 end_nanosec) override;
bool Play(quint64 offset_nanosec) override;
void Stop(bool stop_after = false) override;
void Pause() override;
void Unpause() override;
void Seek(quint64 offset_nanosec) override;
void SetVolumeSW(uint) override;
qint64 position_nanosec() const;
qint64 length_nanosec() const;
qint64 position_nanosec() const override;
qint64 length_nanosec() const override;
#ifdef XINE_ANALYZER
const Engine::Scope& scope(int chunk_length);
#endif
OutputDetailsList GetOutputsList() const;
bool ValidOutput(const QString &output);
QString DefaultOutput() { return "auto"; }
bool CustomDeviceSupport(const QString &output);
bool ALSADeviceSupport(const QString &output);
OutputDetailsList GetOutputsList() const override;
bool ValidOutput(const QString &output) override;
QString DefaultOutput() override { return "auto"; }
bool CustomDeviceSupport(const QString &output) override;
bool ALSADeviceSupport(const QString &output) override;
void ReloadSettings();
void ReloadSettings() override;
bool CanDecode(const QUrl &);
void SetEqualizerEnabled(bool enabled);
void SetEqualizerParameters(int preamp, const QList<int>&);
void SetEqualizerEnabled(bool enabled) override;
void SetEqualizerParameters(int preamp, const QList<int>&) override;
// Simple accessors