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

2
src/plugins/directshow/camera/dscameraservice.cpp
View File

@@ -111,7 +111,7 @@ QMediaControl* DSCameraService::requestControl(const char *name)
if(qstrcmp(name,QVideoRendererControl_iid) == 0)
return m_videoRenderer;
if(qstrcmp(name,QVideoDeviceControl_iid) == 0)
if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0)
return m_videoDevice;
return 0;

2
src/plugins/directshow/camera/dsvideodevicecontrol.cpp
View File

@@ -57,7 +57,7 @@ extern const CLSID CLSID_VideoInputDeviceCategory;
QT_BEGIN_NAMESPACE
DSVideoDeviceControl::DSVideoDeviceControl(QObject *parent)
: QVideoDeviceControl(parent)
: QVideoDeviceSelectorControl(parent)
{
m_session = qobject_cast<DSCameraSession*>(parent);

4
src/plugins/directshow/camera/dsvideodevicecontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef DSVIDEODEVICECONTROL_H
#define DSVIDEODEVICECONTROL_H
#include <qvideodevicecontrol.h>
#include <qvideodeviceselectorcontrol.h>
QT_BEGIN_HEADER
@@ -51,7 +51,7 @@ class DSCameraSession;
//QTM_USE_NAMESPACE
class DSVideoDeviceControl : public QVideoDeviceControl
class DSVideoDeviceControl : public QVideoDeviceSelectorControl
{
Q_OBJECT
public: