diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-19 10:01:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-24 09:11:07 +0100 |
| commit | a78a95ccd4c876bca7fe748c44c9744e828d375e (patch) | |
| tree | 4a72285e10aab435682fb7cdbbc4e70432191b20 /src/multimedia/qmediaserviceprovider.cpp | |
| parent | adb2bd2cd4bb2b01b15f6213681654949f2c797c (diff) | |
Removed QMediaServiceProvider parameter from media objects constructors.
QMediaServiceProvider should be removed from the public API,
to provide media objects with a custom media service.
A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor
with QMediaService* parameter is a cleaner and more
flexible solution.
Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimedia/qmediaserviceprovider.cpp')
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 849a9b602..48640faba 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -613,13 +613,11 @@ QString QMediaServiceProvider::deviceDescription(const QByteArray &serviceType, return QString(); } - -#ifdef QT_BUILD_INTERNAL - static QMediaServiceProvider *qt_defaultMediaServiceProvider = 0; /*! Sets a media service \a provider as the default. + It's useful for unit tests to provide mock service. \internal */ @@ -628,20 +626,15 @@ void QMediaServiceProvider::setDefaultServiceProvider(QMediaServiceProvider *pro qt_defaultMediaServiceProvider = provider; } -#endif /*! Returns a default provider of media services. */ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() { -#ifdef QT_BUILD_INTERNAL return qt_defaultMediaServiceProvider != 0 ? qt_defaultMediaServiceProvider : static_cast<QMediaServiceProvider *>(pluginProvider()); -#else - return pluginProvider(); -#endif } /*! |