Cleanup status handling in QMediaPlayer

Remove the UnknownMediaStatus enum (it's really not helpful)
and avoid storing a copy of the status in the frontend class.

Store the status in the platform media player instance. This
requires some further cleanups to avoid that the reimplementations
store their own copy.

Change-Id: I939e78808f0eaa6a398560661df66c9d986fdd91
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 7 insertions, 21 deletions

diff --git a/tests/auto/unit/mockbackend/qmockmediaplayer.h b/tests/auto/unit/mockbackend/qmockmediaplayer.h
index 30dbbbcc8..b07210846 100644
--- a/tests/auto/unit/mockbackend/qmockmediaplayer.h
+++ b/tests/auto/unit/mockbackend/qmockmediaplayer.h
@@ -40,7 +40,6 @@ public:
     QMockMediaPlayer(QMediaPlayer *parent)
         : QPlatformMediaPlayer(parent)
         , _state(QMediaPlayer::StoppedState)
-        , _mediaStatus(QMediaPlayer::NoMedia)
         , _error(QMediaPlayer::NoError)
         , _duration(0)
         , _position(0)
@@ -61,17 +60,11 @@ public:
 
     QMediaPlayer::PlaybackState state() const { return _state; }
     void updateState(QMediaPlayer::PlaybackState state) { setState(state); }
-    QMediaPlayer::MediaStatus mediaStatus() const { return _mediaStatus; }
-    void updateMediaStatus(QMediaPlayer::MediaStatus status)
-    {
-        emit mediaStatusChanged(_mediaStatus = status);
-    }
     void updateMediaStatus(QMediaPlayer::MediaStatus status, QMediaPlayer::PlaybackState state)
     {
-        _mediaStatus = status;
         _state = state;
 
-        emit mediaStatusChanged(_mediaStatus);
+        mediaStatusChanged(status);
         stateChanged(_state);
     }
 
@@ -114,9 +107,8 @@ public:
     {
         _stream = stream;
         _media = content;
-        _mediaStatus = _media.isEmpty() ? QMediaPlayer::NoMedia : QMediaPlayer::LoadingMedia;
         setState(QMediaPlayer::StoppedState);
-        emit mediaStatusChanged(_mediaStatus);
+        mediaStatusChanged(_media.isEmpty() ? QMediaPlayer::NoMedia : QMediaPlayer::LoadingMedia);
     }
     QIODevice *mediaStream() const { return _stream; }
 
@@ -159,15 +151,11 @@ public:
     void setState(QMediaPlayer::PlaybackState state, QMediaPlayer::MediaStatus status)
     {
         _state = state;
-        _mediaStatus = status;
-        emit mediaStatusChanged(status);
+        mediaStatusChanged(status);
         stateChanged(state);
     }
     void setMediaStatus(QMediaPlayer::MediaStatus status)
     {
-        if (_mediaStatus == status)
-            return;
-        _mediaStatus = status;
         if (status == QMediaPlayer::StalledMedia || status == QMediaPlayer::BufferingMedia)
             bufferProgressChanged(_bufferProgress);
         mediaStatusChanged(status);
@@ -181,7 +169,6 @@ public:
     void reset()
     {
         _state = QMediaPlayer::StoppedState;
-        _mediaStatus = QMediaPlayer::UnknownMediaStatus;
         _error = QMediaPlayer::NoError;
         _duration = 0;
         _position = 0;
@@ -203,7 +190,6 @@ public:
     QAudio::Role m_audioRole = QAudio::UnknownRole;
 
     QMediaPlayer::PlaybackState _state;
-    QMediaPlayer::MediaStatus _mediaStatus;
     QMediaPlayer::Error _error;
     qint64 _duration;
     qint64 _position;
diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
index d3b3b860a..0a069b664 100644
--- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
@@ -177,13 +177,13 @@ void tst_QMediaPlayer::setupCommonTestData()
     QTest::addColumn<QMediaPlayer::Error>("error");
     QTest::addColumn<QString>("errorString");
 
-    QTest::newRow("invalid") << false << QMediaPlayer::StoppedState << QMediaPlayer::UnknownMediaStatus <<
+    QTest::newRow("invalid") << false << QMediaPlayer::StoppedState << QMediaPlayer::InvalidMedia <<
                                 QUrl() << qint64(0) << qint64(0) << false << 0 << false << false << 0 <<
                                 qreal(0) << QMediaPlayer::NoError << QString();
-    QTest::newRow("valid+null") << true << QMediaPlayer::StoppedState << QMediaPlayer::UnknownMediaStatus <<
+    QTest::newRow("valid+null") << true << QMediaPlayer::StoppedState << QMediaPlayer::InvalidMedia <<
                                 QUrl() << qint64(0) << qint64(0) << false << 0 << false << false << 50 <<
                                 qreal(0) << QMediaPlayer::NoError << QString();
-    QTest::newRow("valid+content+stopped") << true << QMediaPlayer::StoppedState << QMediaPlayer::UnknownMediaStatus <<
+    QTest::newRow("valid+content+stopped") << true << QMediaPlayer::StoppedState << QMediaPlayer::InvalidMedia <<
                                 QUrl(QUrl("file:///some.mp3")) << qint64(0) << qint64(0) << false << 50 << false << false << 0 <<
                                 qreal(1) << QMediaPlayer::NoError << QString();
     QTest::newRow("valid+content+playing") << true << QMediaPlayer::PlayingState << QMediaPlayer::LoadedMedia <<
@@ -195,7 +195,7 @@ void tst_QMediaPlayer::setupCommonTestData()
     QTest::newRow("valud+streaming") << true << QMediaPlayer::PlayingState << QMediaPlayer::LoadedMedia <<
                                 QUrl(QUrl("http://example.com/stream")) << qint64(10000) << qint64(10000) << false << 50 << false << true << 0 <<
                                 qreal(1)  << QMediaPlayer::NoError << QString();
-    QTest::newRow("valid+error") << true << QMediaPlayer::StoppedState << QMediaPlayer::UnknownMediaStatus <<
+    QTest::newRow("valid+error") << true << QMediaPlayer::StoppedState << QMediaPlayer::InvalidMedia <<
                                 QUrl(QUrl("http://example.com/stream")) << qint64(0) << qint64(0) << false << 50 << false << false << 0 <<
                                 qreal(0) << QMediaPlayer::ResourceError << QString("Resource unavailable");
 }