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
tests/auto/unit/multimedia.pro
View File

@@ -25,7 +25,7 @@ SUBDIRS += \
qmetadatawritercontrol \
qradiodata \
qradiotuner \
qvideoencodercontrol \
qvideoencodersettingscontrol \
qvideoframe \
qvideosurfaceformat \
qwavedecoder \

4
tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp
View File

@@ -45,9 +45,9 @@
#include <qaudioformat.h>
#include <qaudiorecorder.h>
#include <qaudioencodercontrol.h>
#include <qaudioencodersettingscontrol.h>
#include <qmediarecordercontrol.h>
#include <qaudioendpointselector.h>
#include <qaudioendpointselectorcontrol.h>
#include <qaudiodeviceinfo.h>
#include <qaudioinput.h>
#include <qmediaobject.h>

6
tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp
View File

@@ -48,10 +48,10 @@
#include <qmediarecordercontrol.h>
#include <qmediarecorder.h>
#include <qmetadatawritercontrol.h>
#include <qaudioendpointselector.h>
#include <qaudioencodercontrol.h>
#include <qaudioendpointselectorcontrol.h>
#include <qaudioencodersettingscontrol.h>
#include <qmediacontainercontrol.h>
#include <qvideoencodercontrol.h>
#include <qvideoencodersettingscontrol.h>
#include <qaudioformat.h>
#include "mockmediacontainercontrol.h"

2
tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
View File

@@ -48,7 +48,7 @@
#include <qmediaobject.h>
#include <qmediaservice.h>
#include <qmetadatareadercontrol.h>
#include <qaudioendpointselector.h>
#include <qaudioendpointselectorcontrol.h>
#include "mockmediarecorderservice.h"
#include "mockmediaserviceprovider.h"

18
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -49,10 +49,10 @@
#include <qmediarecordercontrol.h>
#include <qmediarecorder.h>
#include <qmetadatawritercontrol.h>
#include <qaudioendpointselector.h>
#include <qaudioencodercontrol.h>
#include <qaudioendpointselectorcontrol.h>
#include <qaudioencodersettingscontrol.h>
#include <qmediacontainercontrol.h>
#include <qvideoencodercontrol.h>
#include <qvideoencodersettingscontrol.h>
#include <qaudioformat.h>
#include "mockmediarecorderservice.h"
@@ -114,13 +114,13 @@ private slots:
void testVideoSettingsDestructor();
private:
QAudioEncoderControl* encode;
QAudioEndpointSelector* audio;
QAudioEncoderSettingsControl* encode;
QAudioEndpointSelectorControl* audio;
MockMediaObject *object;
MockMediaRecorderService*service;
MockMediaRecorderControl *mock;
QMediaRecorder *capture;
QVideoEncoderControl* videoEncode;
QVideoEncoderSettingsControl* videoEncode;
};
void tst_QMediaRecorder::initTestCase()
@@ -133,9 +133,9 @@ void tst_QMediaRecorder::initTestCase()
object = new MockMediaObject(this, service);
capture = new QMediaRecorder(object);
audio = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid));
encode = qobject_cast<QAudioEncoderControl*>(service->requestControl(QAudioEncoderControl_iid));
videoEncode = qobject_cast<QVideoEncoderControl*>(service->requestControl(QVideoEncoderControl_iid));
audio = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid));
encode = qobject_cast<QAudioEncoderSettingsControl*>(service->requestControl(QAudioEncoderSettingsControl_iid));
videoEncode = qobject_cast<QVideoEncoderSettingsControl*>(service->requestControl(QVideoEncoderSettingsControl_iid));
}
void tst_QMediaRecorder::cleanupTestCase()

2
tests/auto/unit/qmediaservice/tst_qmediaservice.cpp
View File

@@ -43,7 +43,7 @@
#include <QtTest/QtTest>
#include <qvideodevicecontrol.h>
#include <qvideodeviceselectorcontrol.h>
#include <qmediacontrol.h>
#include <qmediaservice.h>

6
tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h
View File

@@ -42,14 +42,14 @@
#ifndef MOCKAUDIOENCODERCONTROL_H
#define MOCKAUDIOENCODERCONTROL_H
#include "qaudioencodercontrol.h"
#include "qaudioencodersettingscontrol.h"
class MockAudioEncoderControl : public QAudioEncoderControl
class MockAudioEncoderControl : public QAudioEncoderSettingsControl
{
Q_OBJECT
public:
MockAudioEncoderControl(QObject *parent):
QAudioEncoderControl(parent)
QAudioEncoderSettingsControl(parent)
{
m_codecs << "audio/pcm" << "audio/mpeg";
m_descriptions << "Pulse Code Modulation" << "mp3 format";

6
tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h
View File

@@ -42,14 +42,14 @@
#ifndef MOCKAUDIOENDPOINTSELECTOR_H
#define MOCKAUDIOENDPOINTSELECTOR_H
#include "qaudioendpointselector.h"
#include "qaudioendpointselectorcontrol.h"
class MockAudioEndpointSelector : public QAudioEndpointSelector
class MockAudioEndpointSelector : public QAudioEndpointSelectorControl
{
Q_OBJECT
public:
MockAudioEndpointSelector(QObject *parent):
QAudioEndpointSelector(parent)
QAudioEndpointSelectorControl(parent)
{
m_names << "device1" << "device2" << "device3";
m_descriptions << "dev1 comment" << "dev2 comment" << "dev3 comment";

12
tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h
View File

@@ -73,15 +73,15 @@ public:
QMediaControl* requestControl(const char *name)
{
if (hasControls && qstrcmp(name,QAudioEncoderControl_iid) == 0)
if (hasControls && qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0)
return mockAudioEncoderControl;
if (hasControls && qstrcmp(name,QAudioEndpointSelector_iid) == 0)
if (hasControls && qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0)
return mockAudioEndpointSelector;
if (hasControls && qstrcmp(name,QMediaRecorderControl_iid) == 0)
return mockControl;
if (hasControls && qstrcmp(name,QMediaContainerControl_iid) == 0)
return mockFormatControl;
if (hasControls && qstrcmp(name,QVideoEncoderControl_iid) == 0)
if (hasControls && qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0)
return mockVideoEncoderControl;
if (hasControls && qstrcmp(name, QMetaDataWriterControl_iid) == 0)
return mockMetaDataControl;
@@ -98,10 +98,10 @@ public:
}
QMediaControl *mockControl;
QAudioEndpointSelector *mockAudioEndpointSelector;
QAudioEncoderControl *mockAudioEncoderControl;
QAudioEndpointSelectorControl *mockAudioEndpointSelector;
QAudioEncoderSettingsControl *mockAudioEncoderControl;
QMediaContainerControl *mockFormatControl;
QVideoEncoderControl *mockVideoEncoderControl;
QVideoEncoderSettingsControl *mockVideoEncoderControl;
MockMetaDataWriterControl *mockMetaDataControl;
MockAvailabilityControl *mockAvailabilityControl;
MockAudioProbeControl *mockAudioProbeControl;

6
tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h
View File

@@ -42,14 +42,14 @@
#ifndef MOCKVIDEOENCODERCONTROL_H
#define MOCKVIDEOENCODERCONTROL_H
#include "qvideoencodercontrol.h"
#include "qvideoencodersettingscontrol.h"
class MockVideoEncoderControl : public QVideoEncoderControl
class MockVideoEncoderControl : public QVideoEncoderSettingsControl
{
Q_OBJECT
public:
MockVideoEncoderControl(QObject *parent):
QVideoEncoderControl(parent)
QVideoEncoderSettingsControl(parent)
{
m_videoCodecs << "video/3gpp" << "video/H264";
m_sizes << QSize(320,240) << QSize(640,480);

4
tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro → tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
View File

@@ -1,9 +1,9 @@
CONFIG += testcase
TARGET = tst_qvideoencodercontrol
TARGET = tst_qvideoencodersettingscontrol
QT += multimedia-private testlib
CONFIG += no_private_qt_headers_warning
SOURCES += \
tst_qvideoencodercontrol.cpp
tst_qvideoencodersettingscontrol.cpp

14
tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp → tests/auto/unit/qvideoencodersettingscontrol/tst_qvideoencodersettingscontrol.cpp
View File

@@ -42,13 +42,13 @@
//TESTED_COMPONENT=src/multimedia
#include <QtTest/QtTest>
#include "qvideoencodercontrol.h"
class MyVideEncoderControl: public QVideoEncoderControl
#include "qvideoencodersettingscontrol.h"
class MyVideEncoderControl: public QVideoEncoderSettingsControl
{
Q_OBJECT
public:
MyVideEncoderControl(QObject *parent = 0 ):QVideoEncoderControl(parent)
MyVideEncoderControl(QObject *parent = 0 ):QVideoEncoderSettingsControl(parent)
{
}
@@ -99,20 +99,20 @@ public:
}
};
class tst_QVideoEncoderControl: public QObject
class tst_QVideoEncoderSettingsControl: public QObject
{
Q_OBJECT
private slots:
void constructor();
};
void tst_QVideoEncoderControl::constructor()
void tst_QVideoEncoderSettingsControl::constructor()
{
QObject parent;
MyVideEncoderControl control(&parent);
}
QTEST_MAIN(tst_QVideoEncoderControl)
#include "tst_qvideoencodercontrol.moc"
QTEST_MAIN(tst_QVideoEncoderSettingsControl)
#include "tst_qvideoencodersettingscontrol.moc"