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/multimedia | |
| parent | b7935a84d71b479f5320e5b062274d344835ba26 (diff) | |
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/multimedia')
| -rw-r--r-- | src/multimedia/controls/qmediarecordercontrol.cpp | 16 | ||||
| -rw-r--r-- | src/multimedia/controls/qmediarecordercontrol.h | 4 | ||||
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 6 |
3 files changed, 6 insertions, 20 deletions
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 3e56a5b89..f7a486cfb 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -135,21 +135,9 @@ QMediaRecorderControl::~QMediaRecorderControl() */ /*! - \fn void QMediaRecorderControl::record() + \fn void QMediaRecorderControl::setState(QMediaRecorder::State state) - Start recording. -*/ - -/*! - \fn void QMediaRecorderControl::pause() - - Pause recording. -*/ - -/*! - \fn void QMediaRecorderControl::stop() - - Stop recording. + Set the media recorder \a state. */ /*! diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index dccca6fe5..2783645e8 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -84,9 +84,7 @@ Q_SIGNALS: void error(int error, const QString &errorString); public Q_SLOTS: - virtual void record() = 0; - virtual void pause() = 0; - virtual void stop() = 0; + virtual void setState(QMediaRecorder::State state) = 0; virtual void setMuted(bool muted) = 0; protected: diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 82f5133a0..81b268d7e 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -841,7 +841,7 @@ void QMediaRecorder::record() d->errorString = QString(); if (d->control) - d->control->record(); + d->control->setState(RecordingState); } /*! @@ -857,7 +857,7 @@ void QMediaRecorder::pause() { Q_D(QMediaRecorder); if (d->control) - d->control->pause(); + d->control->setState(PausedState); } /*! @@ -870,7 +870,7 @@ void QMediaRecorder::stop() { Q_D(QMediaRecorder); if (d->control) - d->control->stop(); + d->control->setState(StoppedState); } /*! |