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

6
src/plugins/avfoundation/camera/avfcamerasession.mm
View File

@@ -43,8 +43,8 @@
#include "avfcamerasession.h"
#include "avfcameraservice.h"
#include "avfcameracontrol.h"
#include "avfvideorenderercontrol.h"
#include "avfvideodevicecontrol.h"
#include "avfcamerarenderercontrol.h"
#include "avfcameradevicecontrol.h"
#include "avfaudioinputselectorcontrol.h"
#include "avfmediavideoprobecontrol.h"
@@ -241,7 +241,7 @@ void AVFCameraSession::updateCameraDevices()
}
}
void AVFCameraSession::setVideoOutput(AVFVideoRendererControl *output)
void AVFCameraSession::setVideoOutput(AVFCameraRendererControl *output)
{
m_videoOutput = output;
if (output)