diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-05-01 13:10:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 03:15:01 +0200 |
| commit | b7935a84d71b479f5320e5b062274d344835ba26 (patch) | |
| tree | e72ac1774590d91f621ed9b21cf0c0ab2c87903b /src/multimedia/recording/qmediarecorder.h | |
| parent | af932e8653b024c93ed49ba30d6f06839ecfced6 (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/recording/qmediarecorder.h')
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 84a6eca63..882334c80 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -73,7 +73,10 @@ class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject, public QMediaBindable Q_OBJECT Q_INTERFACES(QMediaBindableInterface) Q_ENUMS(State) + Q_ENUMS(Status) Q_ENUMS(Error) + Q_PROPERTY(QMediaRecorder::State state READ state NOTIFY stateChanged) + Q_PROPERTY(QMediaRecorder::Status status READ status NOTIFY statusChanged) Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged) Q_PROPERTY(QUrl outputLocation READ outputLocation WRITE setOutputLocation) Q_PROPERTY(QUrl actualLocation READ actualLocation NOTIFY actualLocationChanged) @@ -89,6 +92,17 @@ public: PausedState }; + enum Status { + UnavailableStatus, + UnloadedStatus, + LoadingStatus, + LoadedStatus, + StartingStatus, + RecordingStatus, + PausedStatus, + FinalizingStatus + }; + enum Error { NoError, @@ -110,6 +124,7 @@ public: QUrl actualLocation() const; State state() const; + Status status() const; Error error() const; QString errorString() const; @@ -163,6 +178,7 @@ public Q_SLOTS: Q_SIGNALS: void stateChanged(QMediaRecorder::State state); + void statusChanged(QMediaRecorder::Status status); void durationChanged(qint64 duration); void mutedChanged(bool muted); void actualLocationChanged(const QUrl &location); @@ -198,9 +214,11 @@ private: QT_END_NAMESPACE Q_DECLARE_METATYPE(QMediaRecorder::State) +Q_DECLARE_METATYPE(QMediaRecorder::Status) Q_DECLARE_METATYPE(QMediaRecorder::Error) Q_MEDIA_ENUM_DEBUG(QMediaRecorder, State) +Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Status) Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Error) QT_END_HEADER |