diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-20 16:04:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:29 +0200 |
| commit | bba28afe559837321a2083b3ce046ab774a7ef6b (patch) | |
| tree | 8908febff01fa8cfbe889dcde87e425b00fbf0d8 /tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h | |
| parent | b834fe032f6504ec07f80332d1e22de0b4fc64e0 (diff) | |
Rename a few controls.
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>
Diffstat (limited to 'tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h')
| -rw-r--r-- | tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h index 7fb83e396..ffe1800b9 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h @@ -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"; |