slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Viewfinder settings control (2) - version for iOS/OS X

Browse Source 
QCameraViewfinderSettingsControl2 - version for AV foundation plugin
(the new settings control interface implemented).

Change-Id: I3fbfb87925e57c914d43eb711fa5422e26981207
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Timur Pocheptsov
2015-01-28 17:51:19 +01:00
committed by Yoann Lopes
parent d27f493df0
commit 0d783b7303
9 changed files with 716 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/avfoundation/camera/avfcameraservice.mm
View File

@@ -50,6 +50,7 @@
#include "avfmediavideoprobecontrol.h"
#include "avfcamerafocuscontrol.h"
#include "avfcameraexposurecontrol.h"
#include "avfcameraviewfindersettingscontrol.h"
#ifdef Q_OS_IOS
#include "avfcamerazoomcontrol.h"
@@ -84,6 +85,7 @@ AVFCameraService::AVFCameraService(QObject *parent):
#ifdef Q_OS_IOS
m_cameraZoomControl = new AVFCameraZoomControl(this);
#endif
m_viewfinderSettingsControl2 = new AVFCameraViewfinderSettingsControl2(this);
}
AVFCameraService::~AVFCameraService()
@@ -107,6 +109,8 @@ AVFCameraService::~AVFCameraService()
#ifdef Q_OS_IOS
delete m_cameraZoomControl;
#endif
delete m_viewfinderSettingsControl2;
delete m_session;
}
@@ -140,6 +144,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name)
if (qstrcmp(name, QCameraFocusControl_iid) == 0)
return m_cameraFocusControl;
if (qstrcmp(name, QCameraViewfinderSettingsControl2_iid) == 0)
return m_viewfinderSettingsControl2;
if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) {
AVFMediaVideoProbeControl *videoProbe = 0;
videoProbe = new AVFMediaVideoProbeControl(this);