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

GStreamer camerabin: always provide the zoom control.

Browse Source 
It doesn't actually require GstPhotography to be available at compile
time.

Change-Id: I738e71e4a108a40e79440096be6607afff0134fa
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-07-14 13:53:15 +02:00
parent 3d3d2a4967
commit c106041bd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/gstreamer/camerabin/camerabinservice.cpp
View File

@@ -47,7 +47,6 @@
#include "camerabinflash.h" #include "camerabinflash.h"
#include "camerabinfocus.h" #include "camerabinfocus.h"
#include "camerabinlocks.h" #include "camerabinlocks.h"
#include "camerabinzoom.h"
#endif #endif
#include "camerabinimagecapture.h" #include "camerabinimagecapture.h"
@@ -56,6 +55,7 @@
#include "camerabincapturedestination.h" #include "camerabincapturedestination.h"
#include "camerabinviewfindersettings.h" #include "camerabinviewfindersettings.h"
#include "camerabinviewfindersettings2.h" #include "camerabinviewfindersettings2.h"
#include "camerabinzoom.h"
#include <private/qgstreamerbushelper_p.h> #include <private/qgstreamerbushelper_p.h>
#include <private/qgstutils_p.h> #include <private/qgstutils_p.h>
@@ -226,10 +226,10 @@ QMediaControl *CameraBinService::requestControl(const char *name)
if (qstrcmp(name, QCameraLocksControl_iid) == 0) if (qstrcmp(name, QCameraLocksControl_iid) == 0)
return m_captureSession->cameraLocksControl(); return m_captureSession->cameraLocksControl();
#endif
if (qstrcmp(name, QCameraZoomControl_iid) == 0) if (qstrcmp(name, QCameraZoomControl_iid) == 0)
return m_captureSession->cameraZoomControl(); return m_captureSession->cameraZoomControl();
#endif
if (qstrcmp(name, QCameraImageProcessingControl_iid) == 0) if (qstrcmp(name, QCameraImageProcessingControl_iid) == 0)
return m_captureSession->imageProcessingControl(); return m_captureSession->imageProcessingControl();