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

Rename camera classes to avoid name clash.

Browse Source 
Change-Id: I08fe8f7e75bdbf2c4975863642072061741b5bc6
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
James Turner
2015-01-12 17:15:28 +00:00
committed by Sean Harmer
parent fe21ee675e
commit 9a215d954b
9 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,12 +46,12 @@
#include "avfcameracontrol.h"
#include "avfcamerainfocontrol.h"
#include "avfcamerasession.h"
#include "avfvideodevicecontrol.h"
#include "avfcameradevicecontrol.h"
#include "avfaudioinputselectorcontrol.h"
#include "avfcamerametadatacontrol.h"
#include "avfmediarecordercontrol.h"
#include "avfimagecapturecontrol.h"
#include "avfvideorenderercontrol.h"
#include "avfcamerarenderercontrol.h"
#include "avfmediarecordercontrol.h"
#include "avfimagecapturecontrol.h"
#include "avfmediavideoprobecontrol.h"
@@ -68,7 +68,7 @@ AVFCameraService::AVFCameraService(QObject *parent):
m_session = new AVFCameraSession(this);
m_cameraControl = new AVFCameraControl(this);
m_cameraInfoControl = new AVFCameraInfoControl(this);
m_videoDeviceControl = new AVFVideoDeviceControl(this);
m_videoDeviceControl = new AVFCameraDeviceControl(this);
m_audioInputSelectorControl = new AVFAudioInputSelectorControl(this);
m_metaDataControl = new AVFCameraMetaDataControl(this);
@@ -128,7 +128,7 @@ QMediaControl *AVFCameraService::requestControl(const char *name)
}
if (!m_videoOutput) {
if (qstrcmp(name, QVideoRendererControl_iid) == 0)
m_videoOutput = new AVFVideoRendererControl(this);
m_videoOutput = new AVFCameraRendererControl(this);
if (m_videoOutput) {
m_session->setVideoOutput(m_videoOutput);