diff options
Diffstat (limited to 'src')
36 files changed, 208 insertions, 208 deletions
diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp index 67f9a8fa7..792df4243 100644 --- a/src/gsttools/qgstreamervideowidget.cpp +++ b/src/gsttools/qgstreamervideowidget.cpp @@ -59,7 +59,7 @@ public: virtual ~QGstreamerVideoWidget() {} - QSize sizeHint() const + QSize sizeHint() const override { return m_nativeSize; } @@ -84,7 +84,7 @@ public: } protected: - void paintEvent(QPaintEvent *) + void paintEvent(QPaintEvent *) override { paint_helper(); } diff --git a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h index 768f9c30d..e03da1ab5 100644 --- a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h +++ b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h @@ -96,11 +96,11 @@ public: explicit QGstBufferPoolPlugin(QObject *parent = 0); virtual ~QGstBufferPoolPlugin() {} - virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0; - virtual GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) = 0; - virtual void clear() = 0; + bool isFormatSupported(const QVideoSurfaceFormat &format) const override = 0; + GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) override = 0; + void clear() override = 0; - virtual QAbstractVideoBuffer::HandleType handleType() const = 0; + QAbstractVideoBuffer::HandleType handleType() const override = 0; /*! Build an QAbstractVideoBuffer instance from compatible GstBuffer. @@ -108,7 +108,7 @@ public: This method is called from gstreamer video sink thread. */ - virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0; + QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) override = 0; }; QT_END_NAMESPACE diff --git a/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h b/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h index 9c5ce3052..1a961c6d9 100644 --- a/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h +++ b/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h @@ -63,13 +63,13 @@ public: QGstreamerAudioInputSelector(QObject *parent); ~QGstreamerAudioInputSelector(); - QList<QString> availableInputs() const; - QString inputDescription(const QString& name) const; - QString defaultInput() const; - QString activeInput() const; + QList<QString> availableInputs() const override; + QString inputDescription(const QString &name) const override; + QString defaultInput() const override; + QString activeInput() const override; public Q_SLOTS: - void setActiveInput(const QString& name); + void setActiveInput(const QString &name) override; private: void update(); diff --git a/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h b/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h index d3062c5ad..bacf8c71d 100644 --- a/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h +++ b/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h @@ -72,8 +72,8 @@ public: virtual ~QGstreamerAudioProbeControl(); protected: - void probeCaps(GstCaps *caps); - bool probeBuffer(GstBuffer *buffer); + void probeCaps(GstCaps *caps) override; + bool probeBuffer(GstBuffer *buffer) override; private slots: void bufferProbed(); diff --git a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h index bc3d6703e..e1ac453c7 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h @@ -67,19 +67,19 @@ public: QGstreamerVideoInputDeviceControl(GstElementFactory *factory, QObject *parent); ~QGstreamerVideoInputDeviceControl(); - int deviceCount() const; + int deviceCount() const override; - QString deviceName(int index) const; - QString deviceDescription(int index) const; + QString deviceName(int index) const override; + QString deviceDescription(int index) const override; - int defaultDevice() const; - int selectedDevice() const; + int defaultDevice() const override; + int selectedDevice() const override; static QString primaryCamera() { return tr("Main camera"); } static QString secondaryCamera() { return tr("Front camera"); } public Q_SLOTS: - void setSelectedDevice(int index); + void setSelectedDevice(int index) override; private: GstElementFactory *m_factory; diff --git a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h b/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h index bed411475..f3066fad8 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h @@ -94,8 +94,8 @@ public: int saturation() const; void setSaturation(int saturation); - bool processSyncMessage(const QGstreamerMessage &message); - bool processBusMessage(const QGstreamerMessage &message); + bool processSyncMessage(const QGstreamerMessage &message) override; + bool processBusMessage(const QGstreamerMessage &message) override; Q_SIGNALS: void nativeVideoSizeChanged(); @@ -109,7 +109,7 @@ private: GstElement *findBestVideoSink() const; void setWindowHandle_helper(WId id); void updateIsActive(); - void probeCaps(GstCaps *caps); + void probeCaps(GstCaps *caps) override; static void showPrerollFrameChanged(GObject *, GParamSpec *, QGstreamerVideoOverlay *); GstElement *m_videoSink; diff --git a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h index 7520b7424..b599b0e78 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h @@ -72,8 +72,8 @@ public: explicit QGstreamerVideoProbeControl(QObject *parent); virtual ~QGstreamerVideoProbeControl(); - void probeCaps(GstCaps *caps); - bool probeBuffer(GstBuffer *buffer); + void probeCaps(GstCaps *caps) override; + bool probeBuffer(GstBuffer *buffer) override; void startFlushing(); void stopFlushing(); diff --git a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h index 6dba54fe4..1d22e1125 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h @@ -67,13 +67,13 @@ public: QGstreamerVideoRenderer(QObject *parent = 0); virtual ~QGstreamerVideoRenderer(); - QAbstractVideoSurface *surface() const; - void setSurface(QAbstractVideoSurface *surface); + QAbstractVideoSurface *surface() const override; + void setSurface(QAbstractVideoSurface *surface) override; - GstElement *videoSink(); + GstElement *videoSink() override; - void stopRenderer(); - bool isReady() const { return m_surface != 0; } + void stopRenderer() override; + bool isReady() const override { return m_surface != 0; } signals: void sinkChanged(); diff --git a/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h b/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h index f0a76c152..b2dfece60 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h @@ -73,31 +73,31 @@ public: explicit QGstreamerVideoWidgetControl(QObject *parent = 0, const QByteArray &elementName = QByteArray()); virtual ~QGstreamerVideoWidgetControl(); - GstElement *videoSink(); + GstElement *videoSink() override; - QWidget *videoWidget(); + QWidget *videoWidget() override; - void stopRenderer(); + void stopRenderer() override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - bool isFullScreen() const; - void setFullScreen(bool fullScreen); + bool isFullScreen() const override; + void setFullScreen(bool fullScreen) override; - int brightness() const; - void setBrightness(int brightness); + int brightness() const override; + void setBrightness(int brightness) override; - int contrast() const; - void setContrast(int contrast); + int contrast() const override; + void setContrast(int contrast) override; - int hue() const; - void setHue(int hue); + int hue() const override; + void setHue(int hue) override; - int saturation() const; - void setSaturation(int saturation); + int saturation() const override; + void setSaturation(int saturation) override; - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; signals: void sinkChanged(); @@ -111,8 +111,8 @@ private: void createVideoWidget(); void updateWidgetAttributes(); - bool processSyncMessage(const QGstreamerMessage &message); - bool processBusMessage(const QGstreamerMessage &message); + bool processSyncMessage(const QGstreamerMessage &message) override; + bool processBusMessage(const QGstreamerMessage &message) override; QGstreamerVideoOverlay m_videoOverlay; QGstreamerVideoWidget *m_widget; diff --git a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h b/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h index 949a18773..b489650f9 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h @@ -73,41 +73,41 @@ public: explicit QGstreamerVideoWindow(QObject *parent = 0, const QByteArray &elementName = QByteArray()); ~QGstreamerVideoWindow(); - WId winId() const; - void setWinId(WId id); + WId winId() const override; + void setWinId(WId id) override; - QRect displayRect() const; - void setDisplayRect(const QRect &rect); + QRect displayRect() const override; + void setDisplayRect(const QRect &rect) override; - bool isFullScreen() const; - void setFullScreen(bool fullScreen); + bool isFullScreen() const override; + void setFullScreen(bool fullScreen) override; - QSize nativeSize() const; + QSize nativeSize() const override; - Qt::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(Qt::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const override; + void setAspectRatioMode(Qt::AspectRatioMode mode) override; - void repaint(); + void repaint() override; - int brightness() const; - void setBrightness(int brightness); + int brightness() const override; + void setBrightness(int brightness) override; - int contrast() const; - void setContrast(int contrast); + int contrast() const override; + void setContrast(int contrast) override; - int hue() const; - void setHue(int hue); + int hue() const override; + void setHue(int hue) override; - int saturation() const; - void setSaturation(int saturation); + int saturation() const override; + void setSaturation(int saturation) override; QAbstractVideoSurface *surface() const; - GstElement *videoSink(); + GstElement *videoSink() override; - bool processSyncMessage(const QGstreamerMessage &message); - bool processBusMessage(const QGstreamerMessage &message); - bool isReady() const { return m_windowId != 0; } + bool processSyncMessage(const QGstreamerMessage &message) override; + bool processBusMessage(const QGstreamerMessage &message) override; + bool isReady() const override { return m_windowId != 0; } signals: void sinkChanged(); diff --git a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h index 92128b92e..d2802d9a2 100644 --- a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h +++ b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h @@ -77,17 +77,17 @@ public: ~QGstVideoBuffer(); - MapMode mapMode() const; + MapMode mapMode() const override; #if GST_CHECK_VERSION(1,0,0) - int map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]); + int map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) override; #else - uchar *map(MapMode mode, int *numBytes, int *bytesPerLine); + uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override; #endif - void unmap(); + void unmap() override; - QVariant handle() const { return m_handle; } + QVariant handle() const override { return m_handle; } private: #if GST_CHECK_VERSION(1,0,0) GstVideoInfo m_videoInfo; diff --git a/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h b/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h index 433cdf8e5..6a0c4c6bd 100644 --- a/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h +++ b/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h @@ -100,7 +100,7 @@ public: explicit QGstVideoRendererPlugin(QObject *parent = 0); virtual ~QGstVideoRendererPlugin() {} - virtual QGstVideoRenderer *createRenderer() = 0; + QGstVideoRenderer *createRenderer() override = 0; }; diff --git a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h b/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h index ff59810bc..3971c959d 100644 --- a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h +++ b/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h @@ -76,14 +76,14 @@ public: QGstDefaultVideoRenderer(); ~QGstDefaultVideoRenderer(); - GstCaps *getCaps(QAbstractVideoSurface *surface); - bool start(QAbstractVideoSurface *surface, GstCaps *caps); - void stop(QAbstractVideoSurface *surface); + GstCaps *getCaps(QAbstractVideoSurface *surface) override; + bool start(QAbstractVideoSurface *surface, GstCaps *caps) override; + void stop(QAbstractVideoSurface *surface) override; - bool proposeAllocation(GstQuery *query); + bool proposeAllocation(GstQuery *query) override; - bool present(QAbstractVideoSurface *surface, GstBuffer *buffer); - void flush(QAbstractVideoSurface *surface); + bool present(QAbstractVideoSurface *surface, GstBuffer *buffer) override; + void flush(QAbstractVideoSurface *surface) override; private: QVideoSurfaceFormat m_format; @@ -109,7 +109,7 @@ public: GstFlowReturn render(GstBuffer *buffer); - bool event(QEvent *event); + bool event(QEvent *event) override; private slots: bool handleEvent(QMutexLocker *locker); diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h index c9c5c70e3..f5e26e553 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodercontrol.h @@ -64,25 +64,25 @@ public: QGstreamerAudioDecoderControl(QGstreamerAudioDecoderSession *session, QObject *parent = 0); ~QGstreamerAudioDecoderControl(); - QAudioDecoder::State state() const; + QAudioDecoder::State state() const override; - QString sourceFilename() const; - void setSourceFilename(const QString &fileName); + QString sourceFilename() const override; + void setSourceFilename(const QString &fileName) override; - QIODevice* sourceDevice() const; - void setSourceDevice(QIODevice *device); + QIODevice* sourceDevice() const override; + void setSourceDevice(QIODevice *device) override; - void start(); - void stop(); + void start() override; + void stop() override; - QAudioFormat audioFormat() const; - void setAudioFormat(const QAudioFormat &format); + QAudioFormat audioFormat() const override; + void setAudioFormat(const QAudioFormat &format) override; - QAudioBuffer read(); - bool bufferAvailable() const; + QAudioBuffer read() override; + bool bufferAvailable() const override; - qint64 position() const; - qint64 duration() const; + qint64 position() const override; + qint64 duration() const override; private: // Stuff goes here diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h index df54d39f4..6e52b9d87 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderservice.h @@ -56,8 +56,8 @@ public: QGstreamerAudioDecoderService(QObject *parent = 0); ~QGstreamerAudioDecoderService(); - QMediaControl *requestControl(const char *name); - void releaseControl(QMediaControl *control); + QMediaControl *requestControl(const char *name) override; + void releaseControl(QMediaControl *control) override; private: QGstreamerAudioDecoderControl *m_control; diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h index a5ae56637..d1b96043b 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.h @@ -55,11 +55,11 @@ class QGstreamerAudioDecoderServicePlugin Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "audiodecoder.json") public: - QMediaService* create(QString const& key); - void release(QMediaService *service); + QMediaService* create(const QString &key) override; + void release(QMediaService *service) override; - QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; - QStringList supportedMimeTypes() const; + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList &codecs) const override; + QStringList supportedMimeTypes() const override; private: void updateSupportedMimeTypes() const; diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h index 991ac0043..8038d6a25 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h @@ -73,7 +73,7 @@ public: QAudioDecoder::State state() const { return m_state; } QAudioDecoder::State pendingState() const { return m_pendingState; } - bool processBusMessage(const QGstreamerMessage &message); + bool processBusMessage(const QGstreamerMessage &message) override; #if defined(HAVE_GST_APPSRC) QGstAppSrc *appsrc() const { return m_appSrc; } diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h index b4d5c4a88..04de602ad 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h @@ -62,20 +62,20 @@ public: QGstreamerAudioEncode(QObject *parent); virtual ~QGstreamerAudioEncode(); - QStringList supportedAudioCodecs() const; - QString codecDescription(const QString &codecName) const; + QStringList supportedAudioCodecs() const override; + QString codecDescription(const QString &codecName) const override; QStringList supportedEncodingOptions(const QString &codec) const; QVariant encodingOption(const QString &codec, const QString &name) const; void setEncodingOption(const QString &codec, const QString &name, const QVariant &value); QList<int> supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *isContinuous = 0) const; + bool *isContinuous = 0) const override; QList<int> supportedChannelCounts(const QAudioEncoderSettings &settings = QAudioEncoderSettings()) const; QList<int> supportedSampleSizes(const QAudioEncoderSettings &settings = QAudioEncoderSettings()) const; - QAudioEncoderSettings audioSettings() const; - void setAudioSettings(const QAudioEncoderSettings&); + QAudioEncoderSettings audioSettings() const override; + void setAudioSettings(const QAudioEncoderSettings &) override; GstElement *createEncoder(); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h index 55d85ce6f..0e53f0890 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h @@ -56,22 +56,22 @@ public: bool isValid() const { return true; } - QCamera::State state() const; - void setState(QCamera::State state); + QCamera::State state() const override; + void setState(QCamera::State state) override; - QCamera::Status status() const { return m_status; } + QCamera::Status status() const override { return m_status; } - QCamera::CaptureModes captureMode() const { return m_captureMode; } - void setCaptureMode(QCamera::CaptureModes mode); + QCamera::CaptureModes captureMode() const override { return m_captureMode; } + void setCaptureMode(QCamera::CaptureModes mode) override; - bool isCaptureModeSupported(QCamera::CaptureModes mode) const; + bool isCaptureModeSupported(QCamera::CaptureModes mode) const override; QCamera::LockTypes supportedLocks() const { return QCamera::NoLock; } - bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const; + bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override; public slots: void reloadLater(); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h index aa114535f..6839bbe68 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h @@ -49,15 +49,15 @@ class QGstreamerCaptureMetaDataControl : public QMetaDataWriterControl Q_OBJECT public: QGstreamerCaptureMetaDataControl(QObject *parent); - virtual ~QGstreamerCaptureMetaDataControl() {}; + ~QGstreamerCaptureMetaDataControl() {} - bool isMetaDataAvailable() const { return true; } - bool isWritable() const { return true; } + bool isMetaDataAvailable() const override { return true; } + bool isWritable() const override { return true; } - QVariant metaData(const QString &key) const; - void setMetaData(const QString &key, const QVariant &value); - QStringList availableMetaData() const; + QVariant metaData(const QString &key) const override; + void setMetaData(const QString &key, const QVariant &value) override; + QStringList availableMetaData() const override; Q_SIGNALS: void metaDataChanged(const QMap<QByteArray, QVariant>&); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h index dc731d810..aba98d495 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h @@ -70,8 +70,8 @@ public: QGstreamerCaptureService(const QString &service, QObject *parent = 0); virtual ~QGstreamerCaptureService(); - QMediaControl *requestControl(const char *name); - void releaseControl(QMediaControl *); + QMediaControl *requestControl(const char *name) override; + void releaseControl(QMediaControl *) override; private: void setAudioPreview(GstElement *); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h index 1af9cdc90..d8b7e9768 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h @@ -69,20 +69,20 @@ class QGstreamerCaptureServicePlugin Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediacapture.json") #endif public: - QMediaService* create(QString const& key); - void release(QMediaService *service); + QMediaService* create(const QString &key) override; + void release(QMediaService *service) override; #if defined(USE_GSTREAMER_CAMERA) - QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; + QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override; - QByteArray defaultDevice(const QByteArray &service) const; - QList<QByteArray> devices(const QByteArray &service) const; - QString deviceDescription(const QByteArray &service, const QByteArray &device); + QByteArray defaultDevice(const QByteArray &service) const override; + QList<QByteArray> devices(const QByteArray &service) const override; + QString deviceDescription(const QByteArray &service, const QByteArray &device) override; QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property); #endif - QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; - QStringList supportedMimeTypes() const; + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList &codecs) const override; + QStringList supportedMimeTypes() const override; private: void updateSupportedMimeTypes() const; diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h index 79203224b..e0c9107a7 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h @@ -138,7 +138,7 @@ public: bool isReady() const; - bool processBusMessage(const QGstreamerMessage &message); + bool processBusMessage(const QGstreamerMessage &message) override; void addProbe(QGstreamerAudioProbeControl* probe); void removeProbe(QGstreamerAudioProbeControl* probe); @@ -166,8 +166,8 @@ public slots: void setVolume(qreal volume); private: - void probeCaps(GstCaps *caps); - bool probeBuffer(GstBuffer *buffer); + void probeCaps(GstCaps *caps) override; + bool probeBuffer(GstBuffer *buffer) override; enum PipelineMode { EmptyPipeline, PreviewPipeline, RecordingPipeline, PreviewAndRecordingPipeline }; diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h index 7d4145ae1..f58cf09c5 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h @@ -53,12 +53,12 @@ public: QGstreamerImageCaptureControl(QGstreamerCaptureSession *session); virtual ~QGstreamerImageCaptureControl(); - QCameraImageCapture::DriveMode driveMode() const { return QCameraImageCapture::SingleImageCapture; } - void setDriveMode(QCameraImageCapture::DriveMode) {} + QCameraImageCapture::DriveMode driveMode() const override { return QCameraImageCapture::SingleImageCapture; } + void setDriveMode(QCameraImageCapture::DriveMode) override {} - bool isReadyForCapture() const; - int capture(const QString &fileName); - void cancelCapture(); + bool isReadyForCapture() const override; + int capture(const QString &fileName) override; + void cancelCapture() override; private slots: void updateState(); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h b/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h index d56a739f1..f3ebd3e90 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h @@ -59,13 +59,13 @@ public: virtual ~QGstreamerImageEncode(); QList<QSize> supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = 0) const override; - QStringList supportedImageCodecs() const; - QString imageCodecDescription(const QString &codecName) const; + QStringList supportedImageCodecs() const override; + QString imageCodecDescription(const QString &codecName) const override; - QImageEncoderSettings imageSettings() const; - void setImageSettings(const QImageEncoderSettings &settings); + QImageEncoderSettings imageSettings() const override; + void setImageSettings(const QImageEncoderSettings &settings) override; Q_SIGNALS: void settingsChanged(); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h index 0f25ad5d7..5c730b21d 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h @@ -56,13 +56,13 @@ class QGstreamerMediaContainerControl : public QMediaContainerControl Q_OBJECT public: QGstreamerMediaContainerControl(QObject *parent); - virtual ~QGstreamerMediaContainerControl() {}; + ~QGstreamerMediaContainerControl() {} - virtual QStringList supportedContainers() const { return m_containers.supportedCodecs(); } - virtual QString containerFormat() const { return m_format; } - virtual void setContainerFormat(const QString &formatMimeType) { m_format = formatMimeType; } + QStringList supportedContainers() const override { return m_containers.supportedCodecs(); } + QString containerFormat() const override { return m_format; } + void setContainerFormat(const QString &formatMimeType) override { m_format = formatMimeType; } - virtual QString containerDescription(const QString &formatMimeType) const { return m_containers.codecDescription(formatMimeType); } + QString containerDescription(const QString &formatMimeType) const override { return m_containers.codecDescription(formatMimeType); } QByteArray formatElementName() const { return m_containers.codecElement(containerFormat()); } diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h index 96e263e72..b80716f4c 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h @@ -56,26 +56,26 @@ public: QGstreamerRecorderControl(QGstreamerCaptureSession *session); virtual ~QGstreamerRecorderControl(); - QUrl outputLocation() const; - bool setOutputLocation(const QUrl &sink); + QUrl outputLocation() const override; + bool setOutputLocation(const QUrl &sink) override; - QMediaRecorder::State state() const; - QMediaRecorder::Status status() const; + QMediaRecorder::State state() const override; + QMediaRecorder::Status status() const override; - qint64 duration() const; + qint64 duration() const override; - bool isMuted() const; - qreal volume() const; + bool isMuted() const override; + qreal volume() const override; - void applySettings(); + void applySettings() override; public slots: - void setState(QMediaRecorder::State state); + void setState(QMediaRecorder::State state) override; void record(); void pause(); void stop(); - void setMuted(bool); - void setVolume(qreal volume); + void setMuted(bool) override; + void setVolume(qreal volume) override; private slots: void updateStatus(); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h index 20e855922..a82c7cf4b 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h @@ -56,10 +56,10 @@ public: QGstreamerV4L2Input(QObject *parent = 0); virtual ~QGstreamerV4L2Input(); - GstElement *buildElement(); + GstElement *buildElement() override; - QList<qreal> supportedFrameRates(const QSize &frameSize = QSize()) const; - QList<QSize> supportedResolutions(qreal frameRate = -1) const; + QList<qreal> supportedFrameRates(const QSize &frameSize = QSize()) const override; + QList<QSize> supportedResolutions(qreal frameRate = -1) const override; QByteArray device() const; diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h index 0c8d99d1d..bc6636012 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h @@ -62,18 +62,18 @@ public: virtual ~QGstreamerVideoEncode(); QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = 0) const override; QList< qreal > supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = 0) const override; QPair<int,int> rateAsRational() const; - QStringList supportedVideoCodecs() const; - QString videoCodecDescription(const QString &codecName) const; + QStringList supportedVideoCodecs() const override; + QString videoCodecDescription(const QString &codecName) const override; - QVideoEncoderSettings videoSettings() const; - void setVideoSettings(const QVideoEncoderSettings &settings); + QVideoEncoderSettings videoSettings() const override; + void setVideoSettings(const QVideoEncoderSettings &settings) override; QStringList supportedEncodingOptions(const QString &codec) const; QVariant encodingOption(const QString &codec, const QString &name) const; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h index 2c303f5af..78299b608 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreameravailabilitycontrol.h @@ -51,7 +51,7 @@ class QGStreamerAvailabilityControl : public QMediaAvailabilityControl Q_OBJECT public: QGStreamerAvailabilityControl(QMediaPlayerResourceSetInterface *resources, QObject *parent = 0); - QMultimedia::AvailabilityStatus availability() const; + QMultimedia::AvailabilityStatus availability() const override; private Q_SLOTS: void handleAvailabilityChanged(); diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h index 1bbc5b1a5..bf8f7e842 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h @@ -53,11 +53,11 @@ public: QGstreamerMetaDataProvider( QGstreamerPlayerSession *session, QObject *parent ); virtual ~QGstreamerMetaDataProvider(); - bool isMetaDataAvailable() const; + bool isMetaDataAvailable() const override; bool isWritable() const; - QVariant metaData(const QString &key) const; - QStringList availableMetaData() const; + QVariant metaData(const QString &key) const override; + QStringList availableMetaData() const override; private slots: void updateTags(); diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h index 9ecf5f499..6067a68fc 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -67,42 +67,42 @@ public: QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent = 0); ~QGstreamerPlayerControl(); - QMediaPlayer::State state() const; - QMediaPlayer::MediaStatus mediaStatus() const; + QMediaPlayer::State state() const override; + QMediaPlayer::MediaStatus mediaStatus() const override; - qint64 position() const; - qint64 duration() const; + qint64 position() const override; + qint64 duration() const override; - int bufferStatus() const; + int bufferStatus() const override; - int volume() const; - bool isMuted() const; + int volume() const override; + bool isMuted() const override; - bool isAudioAvailable() const; - bool isVideoAvailable() const; + bool isAudioAvailable() const override; + bool isVideoAvailable() const override; void setVideoOutput(QObject *output); - bool isSeekable() const; - QMediaTimeRange availablePlaybackRanges() const; + bool isSeekable() const override; + QMediaTimeRange availablePlaybackRanges() const override; - qreal playbackRate() const; - void setPlaybackRate(qreal rate); + qreal playbackRate() const override; + void setPlaybackRate(qreal rate) override; - QMediaContent media() const; - const QIODevice *mediaStream() const; - void setMedia(const QMediaContent&, QIODevice *); + QMediaContent media() const override; + const QIODevice *mediaStream() const override; + void setMedia(const QMediaContent&, QIODevice *) override; QMediaPlayerResourceSetInterface* resources() const; public Q_SLOTS: - void setPosition(qint64 pos); + void setPosition(qint64 pos) override; - void play(); - void pause(); - void stop(); + void play() override; + void pause() override; + void stop() override; - void setVolume(int volume); - void setMuted(bool muted); + void setVolume(int volume) override; + void setMuted(bool muted) override; private Q_SLOTS: void updateSessionState(QMediaPlayer::State state); diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h index 423ee9173..ec0c0944b 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -69,8 +69,8 @@ public: QGstreamerPlayerService(QObject *parent = 0); ~QGstreamerPlayerService(); - QMediaControl *requestControl(const char *name); - void releaseControl(QMediaControl *control); + QMediaControl *requestControl(const char *name) override; + void releaseControl(QMediaControl *control) override; private: QGstreamerPlayerControl *m_control; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h index 8e3e8a2af..71eece23e 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.h @@ -58,13 +58,13 @@ class QGstreamerPlayerServicePlugin Q_INTERFACES(QMediaServiceSupportedFormatsInterface) Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediaplayer.json") public: - QMediaService* create(QString const& key); - void release(QMediaService *service); + QMediaService* create(const QString &key) override; + void release(QMediaService *service) override; - QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; + QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override; - QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const; - QStringList supportedMimeTypes() const; + QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList &codecs) const override; + QStringList supportedMimeTypes() const override; private: void updateSupportedMimeTypes() const; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h index 1f93c7780..14ef6070f 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -114,7 +114,7 @@ public: int activeStream(QMediaStreamsControl::StreamType streamType) const; void setActiveStream(QMediaStreamsControl::StreamType streamType, int streamNumber); - bool processBusMessage(const QGstreamerMessage &message); + bool processBusMessage(const QGstreamerMessage &message) override; #if defined(HAVE_GST_APPSRC) QGstAppSrc *appsrc() const { return m_appSrc; } diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h index ec9de39f0..6f332c160 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h @@ -53,13 +53,13 @@ public: QGstreamerStreamsControl(QGstreamerPlayerSession *session, QObject *parent); virtual ~QGstreamerStreamsControl(); - virtual int streamCount(); - virtual StreamType streamType(int streamNumber); + int streamCount() override; + StreamType streamType(int streamNumber) override; - virtual QVariant metaData(int streamNumber, const QString &key); + QVariant metaData(int streamNumber, const QString &key) override; - virtual bool isActive(int streamNumber); - virtual void setActive(int streamNumber, bool state); + bool isActive(int streamNumber) override; + void setActive(int streamNumber, bool state) override; private: QGstreamerPlayerSession *m_session; |