diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-12-21 17:29:22 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 06:46:10 +0000 |
| commit | 1a16281dc71004479679f025adf58f2c77272c99 (patch) | |
| tree | dab5e3d852077d62dc920a7c0c308b0c86cb82eb /src/plugins/gstreamer | |
| parent | f153fcdaf82d8724cbb03248df48c2c8641529e8 (diff) | |
Get rid of QMediaServiceDefaultDeviceInterface
Merge it into QMediaServiceSupportedDevicesInterface.
Change-Id: I842218c7cb6391e86357a09d461be078a6d8a368
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/plugins/gstreamer')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinserviceplugin.h | 2 | ||||
| -rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h index 50eb52d45..79ec59685 100644 --- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h +++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h @@ -51,12 +51,10 @@ QT_BEGIN_NAMESPACE class CameraBinServicePlugin : public QMediaServiceProviderPlugin , public QMediaServiceSupportedDevicesInterface - , public QMediaServiceDefaultDeviceInterface , public QMediaServiceFeaturesInterface { Q_OBJECT Q_INTERFACES(QMediaServiceSupportedDevicesInterface) - Q_INTERFACES(QMediaServiceDefaultDeviceInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "camerabin.json") public: diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h index d8b7e9768..cfb573f64 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.h @@ -51,7 +51,6 @@ class QGstreamerCaptureServicePlugin : public QMediaServiceProviderPlugin #if defined(USE_GSTREAMER_CAMERA) , public QMediaServiceSupportedDevicesInterface - , public QMediaServiceDefaultDeviceInterface , public QMediaServiceFeaturesInterface #endif , public QMediaServiceSupportedFormatsInterface @@ -59,7 +58,6 @@ class QGstreamerCaptureServicePlugin Q_OBJECT #if defined(USE_GSTREAMER_CAMERA) Q_INTERFACES(QMediaServiceSupportedDevicesInterface) - Q_INTERFACES(QMediaServiceDefaultDeviceInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) #endif Q_INTERFACES(QMediaServiceSupportedFormatsInterface) |