summaryrefslogtreecommitdiffstats
path: root/src/multimedia/controls
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-05-01 13:10:33 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-02 03:15:01 +0200
commitb7935a84d71b479f5320e5b062274d344835ba26 (patch)
treee72ac1774590d91f621ed9b21cf0c0ab2c87903b /src/multimedia/controls
parentaf932e8653b024c93ed49ba30d6f06839ecfced6 (diff)
Added QMediaRecorder::status property
QMediaRecorder::state property represents the user request and changed synchronously during record(), pause() or stop() calls. Recorder status is changed asynchronously and represents the actual status of media recorder. This also makes API more consistent with QMediaPlayer and QCamera. Change-Id: I80b4aaa70bb88e555c492908da8c29d0fc5ed5ea Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia/controls')
-rw-r--r--src/multimedia/controls/qmediarecordercontrol.cpp15
-rw-r--r--src/multimedia/controls/qmediarecordercontrol.h2
2 files changed, 16 insertions, 1 deletions
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp
index e952c7dcb..3e56a5b89 100644
--- a/src/multimedia/controls/qmediarecordercontrol.cpp
+++ b/src/multimedia/controls/qmediarecordercontrol.cpp
@@ -117,12 +117,18 @@ QMediaRecorderControl::~QMediaRecorderControl()
*/
/*!
- \fn int QMediaRecorderControl::state() const
+ \fn QMediaRecorder::State QMediaRecorderControl::state() const
Return the current recording state.
*/
/*!
+ \fn QMediaRecorder::Status QMediaRecorderControl::status() const
+
+ Return the current recording status.
+*/
+
+/*!
\fn qint64 QMediaRecorderControl::duration() const
Return the current duration in milliseconds.
@@ -173,6 +179,13 @@ QMediaRecorderControl::~QMediaRecorderControl()
*/
/*!
+ \fn void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status)
+
+ Signals that the \a status of a media recorder has changed.
+*/
+
+
+/*!
\fn void QMediaRecorderControl::durationChanged(qint64 duration)
Signals that the \a duration of the recorded media has changed.
diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h
index d8e7ea5b1..dccca6fe5 100644
--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
@@ -67,6 +67,7 @@ public:
virtual bool setOutputLocation(const QUrl &location) = 0;
virtual QMediaRecorder::State state() const = 0;
+ virtual QMediaRecorder::Status status() const = 0;
virtual qint64 duration() const = 0;
@@ -76,6 +77,7 @@ public:
Q_SIGNALS:
void stateChanged(QMediaRecorder::State state);
+ void statusChanged(QMediaRecorder::Status status);
void durationChanged(qint64 position);
void mutedChanged(bool muted);
void actualLocationChanged(const QUrl &location);