--- a/qtmobility/src/multimedia/qmediaplaylist.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist.h	Wed Jun 23 19:08:38 2010 +0300
@@ -44,8 +44,9 @@
 
 #include <QtCore/qobject.h>
 
-#include "qmediacontent.h"
-#include "qmediaobject.h"
+#include <qmediacontent.h>
+#include <qmediaobject.h>
+#include <qmediabindableinterface.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -53,23 +54,23 @@
 class QMediaPlaylistProvider;
 
 class QMediaPlaylistPrivate;
-class Q_MEDIA_EXPORT QMediaPlaylist : public QObject
+class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject, public QMediaBindableInterface
 {
     Q_OBJECT
+    Q_INTERFACES(QMediaBindableInterface)
     Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged)
     Q_PROPERTY(QMediaContent currentMedia READ currentMedia NOTIFY currentMediaChanged)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
     Q_ENUMS(PlaybackMode Error)
 
 public:
-    enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Linear, Loop, Random };
+    enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop, Random };
     enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError };
 
     QMediaPlaylist(QObject *parent = 0);
     virtual ~QMediaPlaylist();
 
     QMediaObject *mediaObject() const;
-    void setMediaObject(QMediaObject *object);
 
     PlaybackMode playbackMode() const;
     void setPlaybackMode(PlaybackMode mode);
@@ -126,6 +127,7 @@
     void loadFailed();
 
 protected:
+    bool setMediaObject(QMediaObject *object);
     QMediaPlaylistPrivate *d_ptr;
 
 private: