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/recording | |
| 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/recording')
| -rw-r--r-- | src/multimedia/recording/qaudiorecorder.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/recording/qaudiorecorder.h | 2 | ||||
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp index 333ba4ae7..2357ae3c1 100644 --- a/src/multimedia/recording/qaudiorecorder.cpp +++ b/src/multimedia/recording/qaudiorecorder.cpp @@ -118,11 +118,11 @@ public: The \a parent is passed to QMediaObject. */ -QAudioRecorder::QAudioRecorder(QObject *parent, QMediaServiceProvider *serviceProvider): +QAudioRecorder::QAudioRecorder(QObject *parent): QMediaRecorder(*new QAudioRecorderPrivate, 0, parent) { Q_D(QAudioRecorder); - d->provider = serviceProvider; + d->provider = QMediaServiceProvider::defaultServiceProvider(); QMediaService *service = d->provider->requestService(Q_MEDIASERVICE_AUDIOSOURCE); setMediaObject(new QAudioRecorderObject(this, service)); diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h index 84d19e61c..3d59dfb07 100644 --- a/src/multimedia/recording/qaudiorecorder.h +++ b/src/multimedia/recording/qaudiorecorder.h @@ -68,7 +68,7 @@ class Q_MULTIMEDIA_EXPORT QAudioRecorder : public QMediaRecorder Q_OBJECT Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged) public: - QAudioRecorder(QObject *parent = 0, QMediaServiceProvider *serviceProvider = QMediaServiceProvider::defaultServiceProvider()); + QAudioRecorder(QObject *parent = 0); ~QAudioRecorder(); QStringList audioInputs() const; diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 4a46371bc..dcdbb7426 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -43,7 +43,6 @@ #define QMEDIARECORDER_H #include <qmediaobject.h> -#include <qmediaserviceprovider.h> #include <qmediaencodersettings.h> #include <qmediabindableinterface.h> #include <qmediaenumdebug.h> |