diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-14 01:37:47 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-01-14 01:37:47 (GMT) |
| commit | 6c5454b0f8bc75f32af6ceaa7a5730413e9812f9 (patch) | |
| tree | ed9b0f028c8c3489c861d3f5206326a565392b1c /examples/multimedia/audiooutput | |
| parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
| download | Qt-6c5454b0f8bc75f32af6ceaa7a5730413e9812f9.zip Qt-6c5454b0f8bc75f32af6ceaa7a5730413e9812f9.tar.gz Qt-6c5454b0f8bc75f32af6ceaa7a5730413e9812f9.tar.bz2 | |
Revert "Added setChannelCount() to QAudioFormat."
This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c.
Conflicts:
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audiooutput/audiooutput.cpp
src/multimedia/audio/qaudio_mac.cpp
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.h
src/multimedia/audio/qaudioinput.cpp
src/multimedia/audio/qaudiooutput.cpp
tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
tests/auto/qaudioformat/tst_qaudioformat.cpp
tests/auto/qaudioinput/tst_qaudioinput.cpp
tests/auto/qaudiooutput/tst_qaudiooutput.cpp
Diffstat (limited to 'examples/multimedia/audiooutput')
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 58dbbaf..0c57f4d 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -164,8 +164,8 @@ AudioTest::AudioTest() gen->start(); - settings.setSampleRate(SYSTEM_FREQ); - settings.setChannelCount(1); + settings.setFrequency(SYSTEM_FREQ); + settings.setChannels(1); settings.setSampleSize(16); settings.setCodec("audio/pcm"); settings.setByteOrder(QAudioFormat::LittleEndian); |