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

Viewfinder settings control (1) for OS X/iOS

Browse Source 
QCameraViewfinderSettingsControl - version for AVFoundation plugin
('obsolete' viewfinder settings control interface, camera session uses v2
instead). v1 is implemented using v2 (the v2 object from camera service).

Change-Id: I81207b52b0ba5a67e64465f0e5e0c80d7267df3e
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Timur Pocheptsov
2015-02-10 09:29:29 +01:00
committed by Yoann Lopes
parent 0d783b7303
commit 985ee3261b
4 changed files with 184 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ AVFCameraService::AVFCameraService(QObject *parent):
m_cameraZoomControl = new AVFCameraZoomControl(this);
#endif
m_viewfinderSettingsControl2 = new AVFCameraViewfinderSettingsControl2(this);
m_viewfinderSettingsControl = new AVFCameraViewfinderSettingsControl(this);
}
AVFCameraService::~AVFCameraService()
@@ -110,6 +111,7 @@ AVFCameraService::~AVFCameraService()
delete m_cameraZoomControl;
#endif
delete m_viewfinderSettingsControl2;
delete m_viewfinderSettingsControl;
delete m_session;
}
@@ -147,6 +149,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name)
if (qstrcmp(name, QCameraViewfinderSettingsControl2_iid) == 0)
return m_viewfinderSettingsControl2;
if (qstrcmp(name, QCameraViewfinderSettingsControl_iid) == 0)
return m_viewfinderSettingsControl;
if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) {
AVFMediaVideoProbeControl *videoProbe = 0;
videoProbe = new AVFMediaVideoProbeControl(this);