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/radio | |
parent | adb2bd2cd4bb2b01b15f6213681654949f2c797c (diff) | |
download | qtmultimedia-a78a95ccd4c876bca7fe748c44c9744e828d375e.tar.gz |
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/radio')
-rw-r--r-- | src/multimedia/radio/qradiodata.cpp | 9 | ||||
-rw-r--r-- | src/multimedia/radio/qradiodata.h | 3 | ||||
-rw-r--r-- | src/multimedia/radio/qradiotuner.cpp | 9 | ||||
-rw-r--r-- | src/multimedia/radio/qradiotuner.h | 3 |
4 files changed, 14 insertions, 10 deletions
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp index 004880af8..8fb160f01 100644 --- a/src/multimedia/radio/qradiodata.cpp +++ b/src/multimedia/radio/qradiodata.cpp @@ -43,6 +43,7 @@ #include "qmediaservice.h" #include "qmediaobject_p.h" #include "qradiodatacontrol.h" +#include "qmediaserviceprovider.h" #include <QPair> @@ -93,12 +94,14 @@ public: The \a parent is passed to QMediaObject. */ -QRadioData::QRadioData(QObject *parent, QMediaServiceProvider* provider): - QMediaObject(*new QRadioDataPrivate, parent, provider->requestService(Q_MEDIASERVICE_RADIO)) +QRadioData::QRadioData(QObject *parent): + QMediaObject(*new QRadioDataPrivate, + parent, + QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_RADIO)) { Q_D(QRadioData); - d->provider = provider; + d->provider = QMediaServiceProvider::defaultServiceProvider(); if (d->service != 0) { d->control = qobject_cast<QRadioDataControl*>(d->service->requestControl(QRadioDataControl_iid)); diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index e82029690..934b86b0f 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -45,7 +45,6 @@ #include <QtCore/qobject.h> #include "qmediaobject.h" -#include "qmediaserviceprovider.h" #include <qmediaenumdebug.h> #include <QPair> @@ -88,7 +87,7 @@ public: College }; - QRadioData(QObject *parent = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider()); + QRadioData(QObject *parent = 0); ~QRadioData(); bool isAvailable() const; diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp index c4a8cfc47..ee69c6370 100644 --- a/src/multimedia/radio/qradiotuner.cpp +++ b/src/multimedia/radio/qradiotuner.cpp @@ -43,6 +43,7 @@ #include "qmediaservice.h" #include "qmediaobject_p.h" #include "qradiotunercontrol.h" +#include "qmediaserviceprovider.h" #include <QPair> @@ -106,12 +107,14 @@ public: The \a parent is passed to QMediaObject. */ -QRadioTuner::QRadioTuner(QObject *parent, QMediaServiceProvider* provider): - QMediaObject(*new QRadioTunerPrivate, parent, provider->requestService(Q_MEDIASERVICE_RADIO)) +QRadioTuner::QRadioTuner(QObject *parent): + QMediaObject(*new QRadioTunerPrivate, + parent, + QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_RADIO)) { Q_D(QRadioTuner); - d->provider = provider; + d->provider = QMediaServiceProvider::defaultServiceProvider(); if (d->service != 0) { d->control = qobject_cast<QRadioTunerControl*>(d->service->requestControl(QRadioTunerControl_iid)); diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index 87a2ed4d2..c254c72e5 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -45,7 +45,6 @@ #include <QtCore/qobject.h> #include "qmediaobject.h" -#include "qmediaserviceprovider.h" #include <qmediaenumdebug.h> #include <QPair> @@ -83,7 +82,7 @@ public: enum StereoMode { ForceStereo, ForceMono, Auto }; enum SearchMode { SearchFast, SearchGetStationId }; - QRadioTuner(QObject *parent = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider()); + QRadioTuner(QObject *parent = 0); ~QRadioTuner(); bool isAvailable() const; |