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>

6 files changed, 19 insertions, 19 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;
 }
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.h b/src/plugins/gstreamer/camerabin/camerabincontrol.h
index 84f0ad54d..e8ba4898c 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontrol.h
+++ b/src/plugins/gstreamer/camerabin/camerabincontrol.h
@@ -66,10 +66,10 @@ public:
 
     QCamera::Status status() const { return m_status; }
 
-    QCamera::CaptureMode captureMode() const;
-    void setCaptureMode(QCamera::CaptureMode mode);
+    QCamera::CaptureModes captureMode() const;
+    void setCaptureMode(QCamera::CaptureModes mode);
 
-    bool isCaptureModeSupported(QCamera::CaptureMode mode) const;
+    bool isCaptureModeSupported(QCamera::CaptureModes mode) const;
     bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const;
     bool viewfinderColorSpaceConversion() const;
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index dd9bc06af..ecf3afd64 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -401,7 +401,7 @@ void CameraBinSession::captureImage(int requestId, const QString &fileName)
     m_imageFileName = actualFileName;
 }
 
-void CameraBinSession::setCaptureMode(QCamera::CaptureMode mode)
+void CameraBinSession::setCaptureMode(QCamera::CaptureModes mode)
 {
     m_captureMode = mode;
 
@@ -427,7 +427,7 @@ bool CameraBinSession::setOutputLocation(const QUrl& sink)
     return true;
 }
 
-QDir CameraBinSession::defaultDir(QCamera::CaptureMode mode) const
+QDir CameraBinSession::defaultDir(QCamera::CaptureModes mode) const
 {
     QStringList dirCandidates;
 
@@ -1073,7 +1073,7 @@ static bool resolutionLessThan(const QSize &r1, const QSize &r2)
 
 QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
                                                     bool *continuous,
-                                                    QCamera::CaptureMode mode) const
+                                                    QCamera::CaptureModes mode) const
 {
     QList<QSize> res;
 
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h
index 39a595cf9..25679d901 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.h
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.h
@@ -99,15 +99,15 @@ public:
     CameraRole cameraRole() const;
 
     QList< QPair<int,int> > supportedFrameRates(const QSize &frameSize, bool *continuous) const;
-    QList<QSize> supportedResolutions( QPair<int,int> rate, bool *continuous, QCamera::CaptureMode mode) const;
+    QList<QSize> supportedResolutions(QPair<int,int> rate, bool *continuous, QCamera::CaptureModes mode) const;
 
-    QCamera::CaptureMode captureMode() { return m_captureMode; }
-    void setCaptureMode(QCamera::CaptureMode mode);
+    QCamera::CaptureModes captureMode() { return m_captureMode; }
+    void setCaptureMode(QCamera::CaptureModes mode);
 
     QUrl outputLocation() const;
     bool setOutputLocation(const QUrl& sink);    
 
-    QDir defaultDir(QCamera::CaptureMode mode) const;
+    QDir defaultDir(QCamera::CaptureModes mode) const;
     QString generateFileName(const QString &prefix, const QDir &dir, const QString &ext) const;
 
     CameraBinAudioEncoder *audioEncodeControl() const { return m_audioEncodeControl; }
@@ -188,7 +188,7 @@ private:
     bool m_muted;
     bool m_busy;
 
-    QCamera::CaptureMode m_captureMode;
+    QCamera::CaptureModes m_captureMode;
     QMap<QByteArray, QVariant> m_metaData;
 
     QGstreamerElementFactory *m_audioInputFactory;
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp
index 53754d577..e81800090 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.cpp
@@ -70,7 +70,7 @@ QGstreamerCameraControl::~QGstreamerCameraControl()
 {
 }
 
-void QGstreamerCameraControl::setCaptureMode(QCamera::CaptureMode mode)
+void QGstreamerCameraControl::setCaptureMode(QCamera::CaptureModes mode)
 {
     if (m_captureMode == mode)
         return;
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h
index 2e169c088..170343d5b 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h
@@ -63,10 +63,10 @@ public:
 
     QCamera::Status status() const { return m_status; }
 
-    QCamera::CaptureMode captureMode() const { return m_captureMode; }
-    void setCaptureMode(QCamera::CaptureMode mode);
+    QCamera::CaptureModes captureMode() const { return m_captureMode; }
+    void setCaptureMode(QCamera::CaptureModes mode);
 
-    bool isCaptureModeSupported(QCamera::CaptureMode mode) const
+    bool isCaptureModeSupported(QCamera::CaptureModes mode) const
     {
         return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo;
     }
@@ -87,7 +87,7 @@ private slots:
 
 
 private:
-    QCamera::CaptureMode m_captureMode;
+    QCamera::CaptureModes m_captureMode;
     QGstreamerCaptureSession *m_session;
     QCamera::State m_state;
     QCamera::Status m_status;