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/gstreamer/camerabin/camerabincontrol.cpp | |
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/gstreamer/camerabin/camerabincontrol.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontrol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp index 024c6011c..9ae931846 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp @@ -98,12 +98,12 @@ CameraBinControl::~CameraBinControl() { } -QCamera::CaptureMode CameraBinControl::captureMode() const +QCamera::CaptureModes CameraBinControl::captureMode() const { return m_session->captureMode(); } -void CameraBinControl::setCaptureMode(QCamera::CaptureMode mode) +void CameraBinControl::setCaptureMode(QCamera::CaptureModes mode) { if (m_session->captureMode() != mode) { m_session->setCaptureMode(mode); @@ -118,7 +118,7 @@ void CameraBinControl::setCaptureMode(QCamera::CaptureMode mode) } } -bool CameraBinControl::isCaptureModeSupported(QCamera::CaptureMode mode) const +bool CameraBinControl::isCaptureModeSupported(QCamera::CaptureModes mode) const { return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo; } |