diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-05-02 11:15:44 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 04:59:17 +0200 |
commit | b36e2f5209e1278eb3b671cd14d23dc565ee2bae (patch) | |
tree | 435c7265334e176739020c0ecfb2c4a50411ff0a /src/plugins/audiocapture | |
parent | b7935a84d71b479f5320e5b062274d344835ba26 (diff) | |
download | qtmultimedia-b36e2f5209e1278eb3b671cd14d23dc565ee2bae.tar.gz |
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>
Diffstat (limited to 'src/plugins/audiocapture')
-rw-r--r-- | src/plugins/audiocapture/audiomediarecordercontrol.cpp | 41 | ||||
-rw-r--r-- | src/plugins/audiocapture/audiomediarecordercontrol.h | 4 |
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: |