diff options
-rw-r--r-- | src/multimedia/recording/qaudiorecorder.cpp | 6 | ||||
-rw-r--r-- | tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp | 37 |
2 files changed, 24 insertions, 19 deletions
diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp index 40e4ea41c..f8f16418c 100644 --- a/src/multimedia/recording/qaudiorecorder.cpp +++ b/src/multimedia/recording/qaudiorecorder.cpp @@ -155,7 +155,11 @@ QAudioRecorder::~QAudioRecorder() QStringList QAudioRecorder::audioInputs() const { - return d_func()->audioEndpointSelector->availableEndpoints(); + Q_D(const QAudioRecorder); + if (d->audioEndpointSelector) + return d->audioEndpointSelector->availableEndpoints(); + else + return QStringList(); } /*! diff --git a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp index 461a0bc76..8b8c8723b 100644 --- a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp +++ b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp @@ -68,8 +68,8 @@ public slots: void cleanup(); private slots: - //void testNullService(); - //void testNullControl(); + void testNullService(); + void testNullControl(); void testAudioSource(); void testOptions(); void testDevices(); @@ -86,46 +86,47 @@ void tst_QAudioRecorder::init() { mockMediaRecorderService = new MockMediaRecorderService(this, new MockMediaRecorderControl(this)); mockProvider = new MockMediaServiceProvider(mockMediaRecorderService); + audiosource = 0; } void tst_QAudioRecorder::cleanup() { - delete audiosource; + delete mockMediaRecorderService; delete mockProvider; - audiosource = 0; + delete audiosource; + mockMediaRecorderService = 0; mockProvider = 0; + audiosource = 0; } -/* + void tst_QAudioRecorder::testNullService() { - MockProvider provider(0); - QAudioRecorder source(0, &provider); + mockProvider->service = 0; + QAudioRecorder source(0, mockProvider); QCOMPARE(source.audioInputs().size(), 0); QCOMPARE(source.defaultAudioInput(), QString()); - QCOMPARE(source.activeAudioInput(), QString()); + QCOMPARE(source.audioInput(), QString()); } -*/ -/* + + void tst_QAudioRecorder::testNullControl() { - MockRecorderService service; - service.hasAudioDeviceControl = false; - MockProvider provider(&service); - QAudioRecorder source(0, &provider); + mockMediaRecorderService->hasControls = false; + QAudioRecorder source(0, mockProvider); QCOMPARE(source.audioInputs().size(), 0); QCOMPARE(source.defaultAudioInput(), QString()); - QCOMPARE(source.activeAudioInput(), QString()); + QCOMPARE(source.audioInput(), QString()); - QCOMPARE(source.audioDescription("blah"), QString()); + QCOMPARE(source.audioInputDescription("blah"), QString()); - QSignalSpy deviceNameSpy(&source, SIGNAL(activeAudioInputChanged(QString))); + QSignalSpy deviceNameSpy(&source, SIGNAL(audioInputChanged(QString))); source.setAudioInput("blah"); QCOMPARE(deviceNameSpy.count(), 0); } -*/ + void tst_QAudioRecorder::testAudioSource() { audiosource = new QAudioRecorder(0, mockProvider); |