Replaced QMediaRecorderControl::play/stop/pause with setState

This allows to introduce new states without breaking BC.

Change-Id: I03c064cec92d6745b251a51cfb301e7f01f4b765
Reviewed-by: Ling Hu <ling.hu@nokia.com>

2 files changed, 19 insertions, 26 deletions

diff --git a/src/plugins/audiocapture/audiomediarecordercontrol.cpp b/src/plugins/audiocapture/audiomediarecordercontrol.cpp
index e17157c6a..d5d094198 100644
--- a/src/plugins/audiocapture/audiomediarecordercontrol.cpp
+++ b/src/plugins/audiocapture/audiomediarecordercontrol.cpp
@@ -93,36 +93,31 @@ qint64 AudioMediaRecorderControl::duration() const
     return m_session->position();
 }
 
-void AudioMediaRecorderControl::record()
+bool AudioMediaRecorderControl::isMuted() const
 {
-    if (m_state != QMediaRecorder::RecordingState) {
-        m_state = QMediaRecorder::RecordingState;
-        m_session->record();
-        updateStatus();
-    }
+    return false;
 }
 
-void AudioMediaRecorderControl::pause()
+void AudioMediaRecorderControl::setState(QMediaRecorder::State state)
 {
-    if (m_state != QMediaRecorder::PausedState) {
-        m_state = QMediaRecorder::PausedState;
-        m_session->pause();
-        updateStatus();
-    }
-}
+    if (m_state == state)
+        return;
 
-void AudioMediaRecorderControl::stop()
-{
-    if (m_state != QMediaRecorder::StoppedState) {
-        m_state = QMediaRecorder::StoppedState;
+    m_state = state;
+
+    switch (state) {
+    case QMediaRecorder::StoppedState:
+        m_session->stop();
+        break;
+    case QMediaRecorder::PausedState:
         m_session->pause();
-        updateStatus();
+        break;
+    case QMediaRecorder::RecordingState:
+        m_session->record();
+        break;
     }
-}
 
-bool AudioMediaRecorderControl::isMuted() const
-{
-    return false;
+    updateStatus();
 }
 
 void AudioMediaRecorderControl::setMuted(bool)
@@ -141,5 +136,5 @@ void AudioMediaRecorderControl::updateStatus()
 void AudioMediaRecorderControl::handleSessionError(int code, const QString &description)
 {
     emit error(code, description);
-    stop();
+    setState(QMediaRecorder::StoppedState);
 }
diff --git a/src/plugins/audiocapture/audiomediarecordercontrol.h b/src/plugins/audiocapture/audiomediarecordercontrol.h
index edd54ec83..2e9f91786 100644
--- a/src/plugins/audiocapture/audiomediarecordercontrol.h
+++ b/src/plugins/audiocapture/audiomediarecordercontrol.h
@@ -71,9 +71,7 @@ public:
     void applySettings() {}
 
 public slots:
-    void record();
-    void pause();
-    void stop();
+    void setState(QMediaRecorder::State state);
     void setMuted(bool);
 
 private slots: