diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-03-10 11:47:24 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-06-13 13:20:57 +0000 |
| commit | af5e0d04852e5efc1ebd9d099f3906bc66a62338 (patch) | |
| tree | 02544344ef17baae0b24a9d5f38091ca00f7f721 /src/plugins/avfoundation/camera/avfimagecapturecontrol.mm | |
| parent | c6a8c2c846e8f4305aca05be662172e55d5fb674 (diff) | |
| download | qtmultimedia-af5e0d04852e5efc1ebd9d099f3906bc66a62338.tar.gz | |
AVFoundation: re-apply viewfinder settings on mode changes.
Since the active viewfinder resolution can be overridden by the image
and video capture resolutions, we need to re-evaluate the viewfinder
settings whenever the capture mode changes.
Change-Id: Ibdb7a070585cf67ebb2fcfb95ccbdd105f5f41cf
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfimagecapturecontrol.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfimagecapturecontrol.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm index 3e6b6c778..28c77a533 100644 --- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm +++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. @@ -67,6 +67,7 @@ AVFImageCaptureControl::AVFImageCaptureControl(AVFCameraService *service, QObjec connect(m_cameraControl, SIGNAL(statusChanged(QCamera::Status)), SLOT(updateReadyStatus())); connect(m_session, SIGNAL(readyToConfigureConnections()), SLOT(updateCaptureConnection())); + connect(m_cameraControl, SIGNAL(captureModeChanged(QCamera::CaptureModes)), SLOT(updateCaptureConnection())); connect(m_session, &AVFCameraSession::newViewfinderFrame, this, &AVFImageCaptureControl::onNewViewfinderFrame, |