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

Added QCamera::UnloadingStatus and StoppingStatus values.

Browse Source 
These statuses are useful when the camera is stopped and/or unloaded
asynchronously. Previously the status was changed to
LoadedStatus or UnloadedStatus immediately,
even while camera was still active.

Change-Id: Id11021a150b0d34791ea631d7a62086cc0727220
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-04-30 15:48:04 +10:00
committed by Qt by Nokia
parent 4be845d092
commit af932e8653
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/multimedia/camera/qcamera.cpp
View File

@@ -837,6 +837,10 @@ void QCamera::unlock()
The camera is starting in result of state transition to QCamera::ActiveState. The camera is starting in result of state transition to QCamera::ActiveState.
The camera service is not ready to capture yet. The camera service is not ready to capture yet.
\value StoppingStatus
The camera is stopping in result of state transition from QCamera::ActiveState
to QCamera::LoadedState or QCamera::UnloadedState.
\value StandbyStatus \value StandbyStatus
The camera is in the power saving standby mode. The camera is in the power saving standby mode.
The camera may come to the standby mode after some time of inactivity The camera may come to the standby mode after some time of inactivity
@@ -852,6 +856,10 @@ void QCamera::unlock()
The camera device loading in result of state transition from The camera device loading in result of state transition from
QCamera::UnloadedState to QCamera::LoadedState or QCamera::ActiveState. QCamera::UnloadedState to QCamera::LoadedState or QCamera::ActiveState.
\value LoadingStatus
The camera device is unloading in result of state transition from
QCamera::LoadedState or QCamera::ActiveState to QCamera::UnloadedState.
\value UnloadedStatus \value UnloadedStatus
The initial camera status, with camera not loaded. The initial camera status, with camera not loaded.
The camera capabilities including supported capture settings may be unknown. The camera capabilities including supported capture settings may be unknown.

2
src/multimedia/camera/qcamera.h
View File

@@ -90,9 +90,11 @@ public:
UnavailableStatus, UnavailableStatus,
UnloadedStatus, UnloadedStatus,
LoadingStatus, LoadingStatus,
UnloadingStatus,
LoadedStatus, LoadedStatus,
StandbyStatus, StandbyStatus,
StartingStatus, StartingStatus,
StoppingStatus,
ActiveStatus ActiveStatus
}; };