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/gstreamer/camerabin/camerabinaudioencoder.cpp
View File

@@ -46,7 +46,7 @@
#include <QtCore/qdebug.h>
CameraBinAudioEncoder::CameraBinAudioEncoder(QObject *parent)
:QAudioEncoderControl(parent),
:QAudioEncoderSettingsControl(parent),
m_codecs(QGstCodecsInfo::AudioEncoder)
{
}

4
src/plugins/gstreamer/camerabin/camerabinaudioencoder.h
View File

@@ -42,7 +42,7 @@
#ifndef CAMERABINAUDIOENCODE_H
#define CAMERABINAUDIOENCODE_H
#include <qaudioencodercontrol.h>
#include <qaudioencodersettingscontrol.h>
class CameraBinSession;
#include <QtCore/qstringlist.h>
@@ -58,7 +58,7 @@ class CameraBinSession;
QT_USE_NAMESPACE
class CameraBinAudioEncoder : public QAudioEncoderControl
class CameraBinAudioEncoder : public QAudioEncoderSettingsControl
{
Q_OBJECT
public:

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

@@ -177,19 +177,19 @@ QMediaControl *CameraBinService::requestControl(const char *name)
}
}
if (qstrcmp(name,QAudioEndpointSelector_iid) == 0)
if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0)
return m_audioInputEndpointSelector;
if (qstrcmp(name,QVideoDeviceControl_iid) == 0)
if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0)
return m_videoInputDevice;
if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
return m_captureSession->recorderControl();
if (qstrcmp(name,QAudioEncoderControl_iid) == 0)
if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0)
return m_captureSession->audioEncodeControl();
if (qstrcmp(name,QVideoEncoderControl_iid) == 0)
if (qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0)
return m_captureSession->videoEncodeControl();
if (qstrcmp(name,QImageEncoderControl_iid) == 0)

8
src/plugins/gstreamer/camerabin/camerabinservice.h
View File

@@ -46,8 +46,8 @@
#include <gst/gst.h>
QT_BEGIN_NAMESPACE
class QAudioEndpointSelector;
class QVideoDeviceControl;
class QAudioEndpointSelectorControl;
class QVideoDeviceSelectorControl;
QT_END_NAMESPACE
class CameraBinSession;
@@ -82,8 +82,8 @@ private:
CameraBinControl *m_cameraControl;
CameraBinMetaData *m_metaDataControl;
QAudioEndpointSelector *m_audioInputEndpointSelector;
QVideoDeviceControl *m_videoInputDevice;
QAudioEndpointSelectorControl *m_audioInputEndpointSelector;
QVideoDeviceSelectorControl *m_videoInputDevice;
QMediaControl *m_videoOutput;

2
src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp
View File

@@ -46,7 +46,7 @@
#include <QtCore/qdebug.h>
CameraBinVideoEncoder::CameraBinVideoEncoder(CameraBinSession *session)
:QVideoEncoderControl(session),
:QVideoEncoderSettingsControl(session),
m_session(session),
m_codecs(QGstCodecsInfo::VideoEncoder)
{

4
src/plugins/gstreamer/camerabin/camerabinvideoencoder.h
View File

@@ -42,7 +42,7 @@
#ifndef CAMERABINVIDEOENCODE_H
#define CAMERABINVIDEOENCODE_H
#include <qvideoencodercontrol.h>
#include <qvideoencodersettingscontrol.h>
class CameraBinSession;
#include <QtCore/qstringlist.h>
@@ -56,7 +56,7 @@ class CameraBinSession;
QT_USE_NAMESPACE
class CameraBinVideoEncoder : public QVideoEncoderControl
class CameraBinVideoEncoder : public QVideoEncoderSettingsControl
{
Q_OBJECT
public:

2
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
View File

@@ -48,7 +48,7 @@
#include <math.h>
QGstreamerAudioEncode::QGstreamerAudioEncode(QObject *parent)
:QAudioEncoderControl(parent)
:QAudioEncoderSettingsControl(parent)
{
QList<QByteArray> codecCandidates;

4
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h
View File

@@ -42,7 +42,7 @@
#ifndef QGSTREAMERAUDIOENCODE_H
#define QGSTREAMERAUDIOENCODE_H
#include <qaudioencodercontrol.h>
#include <qaudioencodersettingscontrol.h>
#include <QtCore/qstringlist.h>
#include <QtCore/qmap.h>
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
class QGstreamerCaptureSession;
class QGstreamerAudioEncode : public QAudioEncoderControl
class QGstreamerAudioEncode : public QAudioEncoderSettingsControl
{
Q_OBJECT
public:

8
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
View File

@@ -132,19 +132,19 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name)
if (!m_captureSession)
return 0;
if (qstrcmp(name,QAudioEndpointSelector_iid) == 0)
if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0)
return m_audioInputEndpointSelector;
if (qstrcmp(name,QVideoDeviceControl_iid) == 0)
if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0)
return m_videoInputDevice;
if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
return m_captureSession->recorderControl();
if (qstrcmp(name,QAudioEncoderControl_iid) == 0)
if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0)
return m_captureSession->audioEncodeControl();
if (qstrcmp(name,QVideoEncoderControl_iid) == 0)
if (qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0)
return m_captureSession->videoEncodeControl();
if (qstrcmp(name,QImageEncoderControl_iid) == 0)

8
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
View File

@@ -48,8 +48,8 @@
#include <gst/gst.h>
QT_BEGIN_NAMESPACE
class QAudioEndpointSelector;
class QVideoDeviceControl;
class QAudioEndpointSelectorControl;
class QVideoDeviceSelectorControl;
class QGstreamerCaptureSession;
class QGstreamerCameraControl;
@@ -82,8 +82,8 @@ private:
QGstreamerV4L2Input *m_videoInput;
QGstreamerCaptureMetaDataControl *m_metaDataControl;
QAudioEndpointSelector *m_audioInputEndpointSelector;
QVideoDeviceControl *m_videoInputDevice;
QAudioEndpointSelectorControl *m_audioInputEndpointSelector;
QVideoDeviceSelectorControl *m_videoInputDevice;
QMediaControl *m_videoOutput;

2
src/plugins/gstreamer/mediacapture/qgstreamervideoencode.cpp
View File

@@ -48,7 +48,7 @@
#include <math.h>
QGstreamerVideoEncode::QGstreamerVideoEncode(QGstreamerCaptureSession *session)
:QVideoEncoderControl(session), m_session(session)
:QVideoEncoderSettingsControl(session), m_session(session)
{
QList<QByteArray> codecCandidates;
codecCandidates << "video/h264" << "video/xvid" << "video/mpeg4" << "video/mpeg1" << "video/mpeg2" << "video/theora";

4
src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h
View File

@@ -42,7 +42,7 @@
#ifndef QGSTREAMERVIDEOENCODE_H
#define QGSTREAMERVIDEOENCODE_H
#include <qvideoencodercontrol.h>
#include <qvideoencodersettingscontrol.h>
#include <QtCore/qstringlist.h>
#include <QtCore/qmap.h>
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
class QGstreamerCaptureSession;
class QGstreamerVideoEncode : public QVideoEncoderControl
class QGstreamerVideoEncode : public QVideoEncoderSettingsControl
{
Q_OBJECT
public: