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/multimedia/qmediaserviceprovider.cpp | |
| 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/multimedia/qmediaserviceprovider.cpp')
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 775814a77..dda8ad24f 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -234,8 +234,8 @@ public: { const auto instances = loader()->instances(QLatin1String(serviceType)); for (QObject *obj : instances) { - const QMediaServiceDefaultDeviceInterface *iface = - qobject_cast<QMediaServiceDefaultDeviceInterface*>(obj); + const QMediaServiceSupportedDevicesInterface *iface = + qobject_cast<QMediaServiceSupportedDevicesInterface *>(obj); if (iface) { QByteArray name = iface->defaultDevice(serviceType); @@ -244,12 +244,6 @@ public: } } - // if QMediaServiceDefaultDeviceInterface is not implemented, return the - // first available device. - QList<QByteArray> devs = devices(serviceType); - if (!devs.isEmpty()) - return devs.first(); - return QByteArray(); } @@ -574,25 +568,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() */ /*! - \class QMediaServiceDefaultDeviceInterface - \obsolete - \inmodule QtMultimedia - \brief The QMediaServiceDefaultDeviceInterface class interface - identifies the default device used by a media service plug-in. - - A QMediaServiceProviderPlugin may implement this interface. - - \since 5.3 -*/ - -/*! - \fn QMediaServiceDefaultDeviceInterface::~QMediaServiceDefaultDeviceInterface() - - Destroys a media service default device interface. -*/ - -/*! - \fn QByteArray QMediaServiceDefaultDeviceInterface::defaultDevice(const QByteArray &service) const + \fn QByteArray QMediaServiceSupportedDevicesInterface::defaultDevice(const QByteArray &service) const Returns the default device for a \a service type. */ |