Get rid of QCamera::CaptureMode

Whether we capture still images or Video should only
depend on the outputs we have attached to the camera
(QMediaRecoder and QCameraImageCapture). There's no
need for a separate enum here.

Change-Id: I852f5c752abd1184680ca868cb90e995d6d68b27
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/multimedia/platform/darwin/camera/avfstoragelocation.mm b/src/multimedia/platform/darwin/camera/avfstoragelocation.mm
index 46671e938..f2c223c82 100644
--- a/src/multimedia/platform/darwin/camera/avfstoragelocation.mm
+++ b/src/multimedia/platform/darwin/camera/avfstoragelocation.mm
@@ -59,7 +59,7 @@ AVFStorageLocation::~AVFStorageLocation()
  * or specify the full actual path.
  */
 QString AVFStorageLocation::generateFileName(const QString &requestedName,
-                                             QCamera::CaptureMode mode,
+                                             Mode mode,
                                              const QString &prefix,
                                              const QString &ext) const
 {
@@ -72,11 +72,11 @@ QString AVFStorageLocation::generateFileName(const QString &requestedName,
     return requestedName;
 }
 
-QDir AVFStorageLocation::defaultDir(QCamera::CaptureMode mode) const
+QDir AVFStorageLocation::defaultDir(Mode mode) const
 {
     QStringList dirCandidates;
 
-    if (mode == QCamera::CaptureVideo) {
+    if (mode == Video) {
         dirCandidates << QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
     } else {
         dirCandidates << QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);