summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback/qmediaplayer.h
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-01-19 10:01:02 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-24 09:11:07 +0100
commita78a95ccd4c876bca7fe748c44c9744e828d375e (patch)
tree4a72285e10aab435682fb7cdbbc4e70432191b20 /src/multimedia/playback/qmediaplayer.h
parentadb2bd2cd4bb2b01b15f6213681654949f2c797c (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/playback/qmediaplayer.h')
-rw-r--r--src/multimedia/playback/qmediaplayer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 248ca308b..807d6781a 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -42,8 +42,6 @@
#ifndef QMEDIAPLAYER_H
#define QMEDIAPLAYER_H
-
-#include "qmediaserviceprovider.h"
#include "qmediaobject.h"
#include "qmediacontent.h"
#include "qmediaenumdebug.h"
@@ -123,7 +121,7 @@ public:
ServiceMissingError
};
- QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
+ QMediaPlayer(QObject *parent = 0, Flags flags = 0);
~QMediaPlayer();
static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType,