API cleanups in QMediaPlayer

Rename some methods with better names and adjust the API so
that it also can be used for QML.

Change-Id: Ica19675966680416fbe870808336d8fc82065bc1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

2 files changed, 22 insertions, 21 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 7fe96666c..ea3a9121e 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -293,7 +293,7 @@ void QDeclarativeAudio::setSource(const QUrl &url)
             emit errorChanged();
         }
 
-        m_player->setMedia(m_source, nullptr);
+        m_player->setSource(m_source, nullptr);
         m_loaded = true;
     }
     else
@@ -337,7 +337,7 @@ void QDeclarativeAudio::setLoopCount(int loopCount)
     emit loopCountChanged();
 }
 
-void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
+void QDeclarativeAudio::setPlaybackState(QMediaPlayer::PlaybackState playbackState)
 {
     if (m_playbackState == playbackState)
         return;
@@ -346,7 +346,7 @@ void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
         switch (playbackState){
         case (QMediaPlayer::PlayingState):
             if (!m_loaded) {
-                m_player->setMedia(m_source, nullptr);
+                m_player->setSource(m_source, nullptr);
                 m_player->setPosition(m_position);
                 m_loaded = true;
             }
@@ -355,7 +355,7 @@ void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
 
         case (QMediaPlayer::PausedState):
             if (!m_loaded) {
-                m_player->setMedia(m_source, nullptr);
+                m_player->setSource(m_source, nullptr);
                 m_player->setPosition(m_position);
                 m_loaded = true;
             }
@@ -421,7 +421,7 @@ void QDeclarativeAudio::setMuted(bool muted)
 
 qreal QDeclarativeAudio::bufferProgress() const
 {
-    return !m_complete ? 0 : qreal(m_player->bufferStatus()) / 100;
+    return !m_complete ? 0 : qreal(m_player->bufferProgress()) / 100;
 }
 
 bool QDeclarativeAudio::isSeekable() const
@@ -692,7 +692,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
 
 bool QDeclarativeAudio::hasAudio() const
 {
-    return !m_complete ? false : m_player->isAudioAvailable();
+    return !m_complete ? false : m_player->hasAudio();
 }
 
 /*!
@@ -703,7 +703,7 @@ bool QDeclarativeAudio::hasAudio() const
 
 bool QDeclarativeAudio::hasVideo() const
 {
-    return !m_complete ? false : m_player->isVideoAvailable();
+    return !m_complete ? false : m_player->hasVideo();
 }
 
 /*!
@@ -781,7 +781,7 @@ void QDeclarativeAudio::classBegin()
             this, SIGNAL(volumeChanged()));
     connect(m_player, SIGNAL(mutedChanged(bool)),
             this, SIGNAL(mutedChanged()));
-    connect(m_player, SIGNAL(bufferStatusChanged(int)),
+    connect(m_player, SIGNAL(bufferProgressChanged(float)),
             this, SIGNAL(bufferProgressChanged()));
     connect(m_player, SIGNAL(seekableChanged(bool)),
             this, SIGNAL(seekableChanged()));
@@ -816,7 +816,7 @@ void QDeclarativeAudio::componentComplete()
         m_player->setAudioRole(QAudio::Role(m_audioRole));
 
     if (!m_source.isEmpty() && (m_autoLoad || m_autoPlay)) {
-        m_player->setMedia(m_source, nullptr);
+        m_player->setSource(m_source, nullptr);
         m_loaded = true;
         if (m_position > 0)
             m_player->setPosition(m_position);
@@ -840,9 +840,9 @@ void QDeclarativeAudio::_q_statusChanged()
         m_player->play();
     }
     const QMediaPlayer::MediaStatus oldStatus = m_status;
-    const QMediaPlayer::State lastPlaybackState = m_playbackState;
+    const QMediaPlayer::PlaybackState lastPlaybackState = m_playbackState;
 
-    const QMediaPlayer::State state = m_player->state();
+    const QMediaPlayer::PlaybackState state = m_player->playbackState();
 
     m_playbackState = state;
 
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index 085d7e60a..9d64929e3 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -69,24 +69,25 @@ class QDeclarativeAudio : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(int loops READ loopCount WRITE setLoopCount NOTIFY loopCountChanged)
-    Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
-    Q_PROPERTY(bool autoPlay READ autoPlay WRITE setAutoPlay NOTIFY autoPlayChanged)
-    Q_PROPERTY(bool autoLoad READ isAutoLoad WRITE setAutoLoad NOTIFY autoLoadChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
     Q_PROPERTY(int position READ position NOTIFY positionChanged)
     Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
     Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged) // MediaStatus in QMediaPlayer
+    Q_PROPERTY(bool autoPlay READ autoPlay WRITE setAutoPlay NOTIFY autoPlayChanged)
+    Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
     Q_PROPERTY(bool hasAudio READ hasAudio NOTIFY hasAudioChanged)
     Q_PROPERTY(bool hasVideo READ hasVideo NOTIFY hasVideoChanged)
-    Q_PROPERTY(qreal bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
     Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
     Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
-    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
-    Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT)
+    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole NOTIFY audioRoleChanged REVISION 1)
+    Q_PROPERTY(qreal bufferProgress READ bufferProgress NOTIFY bufferProgressChanged)
+
+    Q_PROPERTY(int loops READ loopCount WRITE setLoopCount NOTIFY loopCountChanged) // not needed
+    Q_PROPERTY(bool autoLoad READ isAutoLoad WRITE setAutoLoad NOTIFY autoLoadChanged) // not needed
+    Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT)
     Q_PROPERTY(QVariant videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged REVISION 15)
     Q_ENUMS(Status)
     Q_ENUMS(Error)
@@ -155,7 +156,7 @@ public:
     Status status() const;
     Error error() const;
     PlaybackState playbackState() const;
-    void setPlaybackState(QMediaPlayer::State playbackState);
+    void setPlaybackState(QMediaPlayer::PlaybackState playbackState);
 
     void classBegin() override;
     void componentComplete() override;
@@ -260,7 +261,7 @@ private:
     qreal m_playbackRate;
     AudioRole m_audioRole;
 
-    QMediaPlayer::State m_playbackState;
+    QMediaPlayer::PlaybackState m_playbackState;
     QMediaPlayer::MediaStatus m_status;
     QMediaPlayer::Error m_error;
     QString m_errorString;