1 files changed, 34 insertions, 13 deletions

diff --git a/src/plugins/avfoundation/camera/avfcameraservice.h b/src/plugins/avfoundation/camera/avfcameraservice.h
index 6e5465395..d557872a9 100644
--- a/src/plugins/avfoundation/camera/avfcameraservice.h
+++ b/src/plugins/avfoundation/camera/avfcameraservice.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -46,12 +46,19 @@ class AVFCameraInfoControl;
 class AVFCameraMetaDataControl;
 class AVFVideoWindowControl;
 class AVFVideoWidgetControl;
-class AVFVideoRendererControl;
+class AVFCameraRendererControl;
 class AVFMediaRecorderControl;
 class AVFImageCaptureControl;
 class AVFCameraSession;
-class AVFVideoDeviceControl;
+class AVFCameraDeviceControl;
 class AVFAudioInputSelectorControl;
+class AVFCameraFocusControl;
+class AVFCameraExposureControl;
+class AVFCameraZoomControl;
+class AVFCameraViewfinderSettingsControl2;
+class AVFCameraViewfinderSettingsControl;
+class AVFImageEncoderControl;
+class AVFCameraFlashControl;
 
 class AVFCameraService : public QMediaService
 {
@@ -65,23 +72,37 @@ public:
 
     AVFCameraSession *session() const { return m_session; }
     AVFCameraControl *cameraControl() const { return m_cameraControl; }
-    AVFVideoDeviceControl *videoDeviceControl() const { return m_videoDeviceControl; }
+    AVFCameraDeviceControl *videoDeviceControl() const { return m_videoDeviceControl; }
     AVFAudioInputSelectorControl *audioInputSelectorControl() const { return m_audioInputSelectorControl; }
     AVFCameraMetaDataControl *metaDataControl() const { return m_metaDataControl; }
     AVFMediaRecorderControl *recorderControl() const { return m_recorderControl; }
     AVFImageCaptureControl *imageCaptureControl() const { return m_imageCaptureControl; }
-
+    AVFCameraFocusControl *cameraFocusControl() const { return m_cameraFocusControl; }
+    AVFCameraExposureControl *cameraExposureControl() const {return m_cameraExposureControl; }
+    AVFCameraZoomControl *cameraZoomControl() const {return m_cameraZoomControl; }
+    AVFCameraRendererControl *videoOutput() const {return m_videoOutput; }
+    AVFCameraViewfinderSettingsControl2 *viewfinderSettingsControl2() const {return m_viewfinderSettingsControl2; }
+    AVFCameraViewfinderSettingsControl *viewfinderSettingsControl() const {return m_viewfinderSettingsControl; }
+    AVFImageEncoderControl *imageEncoderControl() const {return m_imageEncoderControl; }
+    AVFCameraFlashControl *flashControl() const {return m_flashControl; }
 
 private:
     AVFCameraSession *m_session;
     AVFCameraControl *m_cameraControl;
     AVFCameraInfoControl *m_cameraInfoControl;
-    AVFVideoDeviceControl *m_videoDeviceControl;
+    AVFCameraDeviceControl *m_videoDeviceControl;
     AVFAudioInputSelectorControl *m_audioInputSelectorControl;
-    AVFVideoRendererControl *m_videoOutput;
+    AVFCameraRendererControl *m_videoOutput;
     AVFCameraMetaDataControl *m_metaDataControl;
     AVFMediaRecorderControl *m_recorderControl;
     AVFImageCaptureControl *m_imageCaptureControl;
+    AVFCameraFocusControl *m_cameraFocusControl;
+    AVFCameraExposureControl *m_cameraExposureControl;
+    AVFCameraZoomControl *m_cameraZoomControl;
+    AVFCameraViewfinderSettingsControl2 *m_viewfinderSettingsControl2;
+    AVFCameraViewfinderSettingsControl *m_viewfinderSettingsControl;
+    AVFImageEncoderControl *m_imageEncoderControl;
+    AVFCameraFlashControl *m_flashControl;
 };
 
 QT_END_NAMESPACE