Make QDeclarativeAudio use QMediaPlayer instead of the controls.

Very minor changes in semantics due to previous differences:
* negative positions are not supported any more (clamped to >= 0)
* setting muted to the same value previously set to the control itself
  won't signal any more.

Change-Id: Iacf4310508d853ae82b63dee28095fce12b6ff28
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index 7dae41074..8ac3eef13 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -158,7 +158,7 @@ public:
     void classBegin();
     void componentComplete();
 
-    QObject *mediaObject() { return m_mediaObject; }
+    QObject *mediaObject() { return m_player; }
 
     Availability availability() const;
 
@@ -236,7 +236,7 @@ Q_SIGNALS:
     void mediaObjectChanged();
 
 private Q_SLOTS:
-    void _q_error(int, const QString &);
+    void _q_error(QMediaPlayer::Error);
     void _q_availabilityChanged(QtMultimedia::AvailabilityError);
     void _q_statusChanged();
 
@@ -253,16 +253,6 @@ private:
     int m_position;
     qreal m_vol;
     qreal m_playbackRate;
-    QMediaService *m_mediaService;
-    QMediaPlayerControl *m_playerControl;
-
-    QMediaObject *m_mediaObject;
-    QMediaServiceProvider *m_mediaProvider;
-    QMetaDataReaderControl *m_metaDataControl;
-    QDeclarativeMediaBaseAnimation *m_animation;
-    QScopedPointer<QDeclarativeMediaMetaData> m_metaData;
-
-    QMediaAvailabilityControl *m_availabilityControl;
 
     QMediaPlayer::State m_playbackState;
     QMediaPlayer::MediaStatus m_status;
@@ -270,6 +260,10 @@ private:
     QString m_errorString;
     QUrl m_source;
 
+    QScopedPointer<QDeclarativeMediaMetaData> m_metaData;
+
+    QMediaPlayer *m_player;
+
     friend class QDeclarativeMediaBaseAnimation;
 };