diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-12 16:27:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 00:58:30 +0100 |
| commit | 53d71baed324d43bf5bac1fd50fc2eb4764b3857 (patch) | |
| tree | d60dc8f9829959a555ad071e19a0d15b2d251339 /src/plugins/directshow | |
| parent | a6268601c907c56555ae42668e983a447c0da2eb (diff) | |
Changed QCamera::captureMode property to QFlags
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.
Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/camera/dscameracontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/dscameracontrol.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/directshow/camera/dscameracontrol.cpp b/src/plugins/directshow/camera/dscameracontrol.cpp index a2a4de7a2..fde5bd1cb 100644 --- a/src/plugins/directshow/camera/dscameracontrol.cpp +++ b/src/plugins/directshow/camera/dscameracontrol.cpp @@ -71,7 +71,7 @@ void DSCameraControl::setState(QCamera::State state) } } -bool DSCameraControl::isCaptureModeSupported(QCamera::CaptureMode mode) const +bool DSCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const { bool bCaptureSupported = false; switch (mode) { diff --git a/src/plugins/directshow/camera/dscameracontrol.h b/src/plugins/directshow/camera/dscameracontrol.h index b18bb289b..66968483c 100644 --- a/src/plugins/directshow/camera/dscameracontrol.h +++ b/src/plugins/directshow/camera/dscameracontrol.h @@ -64,8 +64,8 @@ public: void stop(); QCamera::State state() const; - QCamera::CaptureMode captureMode() const { return m_captureMode; } - void setCaptureMode(QCamera::CaptureMode mode) + QCamera::CaptureModes captureMode() const { return m_captureMode; } + void setCaptureMode(QCamera::CaptureModes mode) { if (m_captureMode != mode) { m_captureMode = mode; @@ -76,13 +76,13 @@ public: void setState(QCamera::State state); QCamera::Status status() const { return QCamera::UnavailableStatus; } - bool isCaptureModeSupported(QCamera::CaptureMode mode) const; + bool isCaptureModeSupported(QCamera::CaptureModes mode) const; bool canChangeProperty(PropertyChangeType /* changeType */, QCamera::Status /* status */) const {return false; } private: DSCameraSession *m_session; DSCameraService *m_service; - QCamera::CaptureMode m_captureMode; + QCamera::CaptureModes m_captureMode; }; QT_END_NAMESPACE |