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

Expose camera status to QML Camera element

Browse Source 
It's exposed as Camera.cameraStatus property.

Change-Id: Id3b477266d3a666b7a2a61cd4579f0e3f873d3b8
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-05-16 13:25:38 +10:00
committed by Qt by Nokia
parent b96ca81108
commit be6d80e57a
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/imports/multimedia/qdeclarativecamera_p.h
View File

@@ -81,6 +81,7 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus
Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged)
Q_PROPERTY(Status cameraStatus READ cameraStatus NOTIFY cameraStatusChanged)
Q_PROPERTY(LockStatus lockStatus READ lockStatus NOTIFY lockStatusChanged)
Q_PROPERTY(Error errorCode READ errorCode NOTIFY errorChanged)
Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
@@ -102,6 +103,7 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus
Q_ENUMS(CaptureMode)
Q_ENUMS(State)
Q_ENUMS(Status)
Q_ENUMS(LockStatus)
Q_ENUMS(Error)
@@ -127,6 +129,19 @@ public:
UnloadedState = QCamera::UnloadedState
};
enum Status
{
UnavailableStatus = QCamera::UnavailableStatus,
UnloadedStatus = QCamera::UnloadedStatus,
LoadingStatus = QCamera::LoadingStatus,
UnloadingStatus = QCamera::UnloadingStatus,
LoadedStatus = QCamera::LoadedStatus,
StandbyStatus = QCamera::StandbyStatus,
StartingStatus = QCamera::StartingStatus,
StoppingStatus = QCamera::StoppingStatus,
ActiveStatus = QCamera::ActiveStatus
};
enum LockStatus
{
Unlocked = QCamera::Unlocked,
@@ -220,6 +235,7 @@ public:
CaptureMode captureMode() const;
State cameraState() const;
Status cameraStatus() const;
Error errorCode() const;
QString errorString() const;
@@ -254,6 +270,7 @@ Q_SIGNALS:
void captureModeChanged();
void cameraStateChanged(QDeclarativeCamera::State);
void cameraStatusChanged();
void lockStatusChanged();