summaryrefslogtreecommitdiffstats
path: root/src/plugins/avfoundation/camera/avfcamerasession.mm
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-12-23 11:49:42 +0100
committerLars Knoll <lars.knoll@qt.io>2021-01-21 19:56:31 +0000
commit4f7daef43da220869475d085ec2fb68083d53696 (patch)
tree12efb8a18fcd9d3cf43b1ca86581b868da746917 /src/plugins/avfoundation/camera/avfcamerasession.mm
parenta9428fd087035e2f80c8f1230917d12b3d20be4c (diff)
Get rid of the old viewfindersettings backend interface
Change-Id: Id7b82b445ac528a30dd67ead01ffa73af298d3d3 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')
-rw-r--r--src/plugins/avfoundation/camera/avfcamerasession.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index ebefa07e5..a44a2d62a 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -280,7 +280,7 @@ void AVFCameraSession::setCapturePreviewOutput(AVFCameraWindowControl *output)
if (m_capturePreviewWindowOutput) {
AVCaptureVideoPreviewLayer *previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:m_captureSession];
m_capturePreviewWindowOutput->setLayer(previewLayer);
- if (AVFCameraViewfinderSettingsControl2 *vfControl = m_service->viewfinderSettingsControl2()) {
+ if (AVFCameraViewfinderSettingsControl *vfControl = m_service->viewfinderSettingsControl()) {
m_capturePreviewWindowOutput->setNativeSize(vfControl->viewfinderSettings().resolution());
}
}
@@ -426,7 +426,7 @@ bool AVFCameraSession::applyImageEncoderSettings()
bool AVFCameraSession::applyViewfinderSettings()
{
- if (AVFCameraViewfinderSettingsControl2 *vfControl = m_service->viewfinderSettingsControl2()) {
+ if (AVFCameraViewfinderSettingsControl *vfControl = m_service->viewfinderSettingsControl()) {
QCamera::CaptureModes currentMode = m_service->cameraControl()->captureMode();
QCameraViewfinderSettings vfSettings(vfControl->requestedSettings());
// Viewfinder and image capture solutions must be the same, if an image capture