diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-07-16 11:28:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 09:49:47 +0200 |
| commit | ae728a4b1e2a0065bab67b5c3b114ef1c30b674a (patch) | |
| tree | 36f5c3f60faca8d70dd94673dfa44570e6f367b4 /tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp | |
| parent | 29a2d09a43b34c309b32d17a0a5ba2a4737342c5 (diff) | |
Replaced endpoint control with audio input and output controls
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp')
| -rw-r--r-- | tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 49f7d57a5..b6763fcb9 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -49,7 +49,7 @@ #include <qmediarecordercontrol.h> #include <qmediarecorder.h> #include <qmetadatawritercontrol.h> -#include <qaudioendpointselectorcontrol.h> +#include <qaudioinputselectorcontrol.h> #include <qaudioencodersettingscontrol.h> #include <qmediacontainercontrol.h> #include <qvideoencodersettingscontrol.h> @@ -116,7 +116,7 @@ private slots: private: QAudioEncoderSettingsControl* encode; - QAudioEndpointSelectorControl* audio; + QAudioInputSelectorControl* audio; MockMediaObject *object; MockMediaRecorderService*service; MockMediaRecorderControl *mock; @@ -134,7 +134,7 @@ void tst_QMediaRecorder::initTestCase() object = new MockMediaObject(this, service); capture = new QMediaRecorder(object); - audio = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid)); + audio = qobject_cast<QAudioInputSelectorControl*>(service->requestControl(QAudioInputSelectorControl_iid)); encode = qobject_cast<QAudioEncoderSettingsControl*>(service->requestControl(QAudioEncoderSettingsControl_iid)); videoEncode = qobject_cast<QVideoEncoderSettingsControl*>(service->requestControl(QVideoEncoderSettingsControl_iid)); } @@ -396,14 +396,14 @@ void tst_QMediaRecorder::testVolume() void tst_QMediaRecorder::testAudioDeviceControl() { - QSignalSpy readSignal(audio,SIGNAL(activeEndpointChanged(QString))); - QVERIFY(audio->availableEndpoints().size() == 3); - QVERIFY(audio->defaultEndpoint().compare("device1") == 0); - audio->setActiveEndpoint("device2"); + QSignalSpy readSignal(audio,SIGNAL(activeInputChanged(QString))); + QVERIFY(audio->availableInputs().size() == 3); + QVERIFY(audio->defaultInput().compare("device1") == 0); + audio->setActiveInput("device2"); QTestEventLoop::instance().enterLoop(1); - QVERIFY(audio->activeEndpoint().compare("device2") == 0); + QVERIFY(audio->activeInput().compare("device2") == 0); QVERIFY(readSignal.count() == 1); - QVERIFY(audio->endpointDescription("device2").compare("dev2 comment") == 0); + QVERIFY(audio->inputDescription("device2").compare("dev2 comment") == 0); } void tst_QMediaRecorder::testAudioEncodeControl() |