--- a/qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp Wed Jun 23 19:08:38 2010 +0300
@@ -42,7 +42,7 @@
#include <QtTest/QtTest>
#include <QDebug>
-#include <QtMultimedia/qaudioformat.h>
+#include <qaudioformat.h>
#include <qaudiocapturesource.h>
#include <qaudioencodercontrol.h>
@@ -101,7 +101,8 @@
MockMediaRecorderControl(QObject *parent = 0):
QMediaRecorderControl(parent),
m_state(QMediaRecorder::StoppedState),
- m_position(0) {}
+ m_position(0),
+ m_muted(false) {}
~MockMediaRecorderControl() {}
@@ -110,6 +111,7 @@
QMediaRecorder::State state() const { return m_state; }
qint64 duration() const { return m_position; }
void applySettings() {}
+ bool isMuted() const { return m_muted; }
public slots:
void record()
@@ -132,10 +134,17 @@
emit stateChanged(m_state);
}
+ void setMuted(bool muted)
+ {
+ if (m_muted != muted)
+ emit mutedChanged(m_muted = muted);
+ }
+
public:
QUrl m_sink;
QMediaRecorder::State m_state;
qint64 m_position;
+ bool m_muted;
};
class MockAudioEndpointSelector : public QAudioEndpointSelector
@@ -213,7 +222,7 @@
delete mockAudioEndpointSelector;
}
- QMediaControl* control(const char *iid) const
+ QMediaControl* requestControl(const char *iid)
{
if (qstrcmp(iid, QAudioEncoderControl_iid) == 0)
return mockAudioEncoderControl;
@@ -227,6 +236,8 @@
return 0;
}
+ void releaseControl(QMediaControl*) {}
+
MockAudioEncoderControl *mockAudioEncoderControl;
MockMediaRecorderControl *mockMediaRecorderControl;
MockAudioEndpointSelector *mockAudioEndpointSelector;