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

Rename a few controls.

Browse Source 
The encoder controls could be confused with actual encoding, so make
clear they are just settings.  Also, the end point selector controls
were not named very well.

Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-20 16:04:57 +10:00
committed by Qt by Nokia
parent b834fe032f
commit bba28afe55
60 changed files with 247 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/multimedia/camera/qcamera.cpp
View File

@@ -51,7 +51,7 @@
#include <qmediarecordercontrol.h>
#include <qcameraimageprocessingcontrol.h>
#include <qcameraimagecapturecontrol.h>
#include <qvideodevicecontrol.h>
#include <qvideodeviceselectorcontrol.h>
#include <QDebug>
@@ -122,7 +122,7 @@ public:
QMediaServiceProvider *provider;
QCameraControl *control;
QVideoDeviceControl *deviceControl;
QVideoDeviceSelectorControl *deviceControl;
QCameraLocksControl *locksControl;
QCameraExposure *cameraExposure;
@@ -245,7 +245,7 @@ void QCameraPrivate::initControls()
if (service) {
control = qobject_cast<QCameraControl *>(service->requestControl(QCameraControl_iid));
locksControl = qobject_cast<QCameraLocksControl *>(service->requestControl(QCameraLocksControl_iid));
deviceControl = qobject_cast<QVideoDeviceControl*>(service->requestControl(QVideoDeviceControl_iid));
deviceControl = qobject_cast<QVideoDeviceSelectorControl*>(service->requestControl(QVideoDeviceSelectorControl_iid));
if (control) {
q->connect(control, SIGNAL(stateChanged(QCamera::State)), q, SLOT(_q_updateState(QCamera::State)));