--- a/qtmobility/src/multimedia/qmediaplayer.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayer.h	Wed Jun 23 19:08:38 2010 +0300
@@ -51,13 +51,16 @@
 QT_BEGIN_NAMESPACE
 
 class QMediaPlaylist;
+class QVideoWidget;
+class QGraphicsVideoItem;
 
 
 class QMediaPlayerPrivate;
-class Q_MEDIA_EXPORT QMediaPlayer : public QMediaObject
+class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject
 {
     Q_OBJECT
     Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaChanged)
+    Q_PROPERTY(QMediaPlaylist * playlist READ playlist WRITE setPlaylist)
     Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
     Q_PROPERTY(qint64 position READ position WRITE setPosition NOTIFY positionChanged)
     Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)
@@ -114,13 +117,17 @@
     QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
     ~QMediaPlayer();
 
-    static QtMediaServices::SupportEstimate hasSupport(const QString &mimeType,
+    static QtMultimedia::SupportEstimate hasSupport(const QString &mimeType,
                                             const QStringList& codecs = QStringList(),
                                             Flags flags = 0);
     static QStringList supportedMimeTypes(Flags flags = 0);
 
+    void setVideoOutput(QVideoWidget *);
+    void setVideoOutput(QGraphicsVideoItem *);
+
     QMediaContent media() const;
     const QIODevice *mediaStream() const;
+    QMediaPlaylist *playlist() const;
 
     State state() const;
     MediaStatus mediaStatus() const;
@@ -136,7 +143,7 @@
     int bufferStatus() const;
 
     bool isSeekable() const;
-    qreal playbackRate() const;
+    qreal playbackRate() const;   
 
     Error error() const;
     QString errorString() const;
@@ -153,6 +160,7 @@
     void setPlaybackRate(qreal rate);
 
     void setMedia(const QMediaContent &media, QIODevice *stream = 0);
+    void setPlaylist(QMediaPlaylist *playlist);
 
 Q_SIGNALS:
     void mediaChanged(const QMediaContent &media);
@@ -176,8 +184,8 @@
     void error(QMediaPlayer::Error error);
 
 public:
-    virtual void bind(QObject*);
-    virtual void unbind(QObject*);
+    virtual bool bind(QObject *);
+    virtual void unbind(QObject *);
 
 private:
     Q_DISABLE_COPY(QMediaPlayer)