slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced QMediaRecorderControl::play/stop/pause with setState

Browse Source 
This allows to introduce new states without breaking BC.

Change-Id: I03c064cec92d6745b251a51cfb301e7f01f4b765
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-05-02 11:15:44 +10:00
committed by Qt by Nokia
parent b7935a84d7
commit b36e2f5209
8 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/multimedia/controls/qmediarecordercontrol.cpp
View File

@@ -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.
*/
/*!

4
src/multimedia/controls/qmediarecordercontrol.h
View File

@@ -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:

6
src/multimedia/recording/qmediarecorder.cpp
View File

@@ -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);
}
/*!