API changes to QML element MediaPlayer aka Audio

Changed Video.qml for new API
Removed lowercase enum copies, replaced with calling
	parent (VideoOutput, MediaPlayer) enums
Removed properties playing, paused
Removed signals started, resumed
Added readonly property playbackState
Added signal playing
Added autoPlay property
Fixed unit tests for new API

Added backwards compatibility for QtMultimedia 4

Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

1 files changed, 17 insertions, 15 deletions

diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h
index 9df5db1ce..78c3524e2 100644
--- a/src/imports/multimedia/qdeclarativemediabase_p.h
+++ b/src/imports/multimedia/qdeclarativemediabase_p.h
@@ -81,17 +81,11 @@ public:
     QUrl source() const;
     void setSource(const QUrl &url);
 
-    bool isAutoLoad() const;
-    void setAutoLoad(bool autoLoad);
-
     int loopCount() const;
     void setLoopCount(int loopCount);
 
-    bool isPlaying() const;
-    void setPlaying(bool playing);
-
-    bool isPaused() const;
-    void setPaused(bool paused);
+    QMediaPlayer::State playbackState() const;
+    void setPlaybackState(QMediaPlayer::State playbackState);
 
     int duration() const;
 
@@ -121,21 +115,27 @@ public:
 
     void componentComplete();
 
+    bool isAutoLoad() const;
+    void setAutoLoad(bool autoLoad);
+
+    bool autoPlay() const;
+    void setAutoPlay(bool autoplay);
+
 protected:
     void shutdown();
 
     void setObject(QObject *object, const QByteArray &type = Q_MEDIASERVICE_MEDIAPLAYER);
 
     virtual void sourceChanged() = 0;
-    virtual void autoLoadChanged() = 0;
-    virtual void playingChanged() = 0;
-    virtual void pausedChanged() = 0;
     virtual void loopCountChanged() = 0;
 
-    virtual void started() = 0;
-    virtual void resumed() = 0;
     virtual void paused() = 0;
     virtual void stopped() = 0;
+    virtual void playing() = 0;
+
+    virtual void autoLoadChanged() = 0;
+
+    virtual void playbackStateChanged() = 0;
 
     virtual void statusChanged() = 0;
 
@@ -152,8 +152,9 @@ protected:
 
     virtual void errorChanged() = 0;
 
-    bool m_paused;
-    bool m_playing;
+    virtual void autoPlayChanged() = 0;
+
+    bool m_autoPlay;
     bool m_autoLoad;
     bool m_loaded;
     bool m_muted;
@@ -173,6 +174,7 @@ protected:
     QDeclarativeMediaBaseAnimation *m_animation;
     QScopedPointer<QDeclarativeMediaMetaData> m_metaData;
 
+    QMediaPlayer::State m_playbackState;
     QMediaPlayer::MediaStatus m_status;
     QMediaPlayer::Error m_error;
     QString m_errorString;