diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 14:26:22 +0100 |
commit | e757890f4a5669b396039211902224f31666725a (patch) | |
tree | bb220ff8b9d8d4a64ce5f197a4b39e3e5965da63 /examples/multimedia | |
parent | caf0cbca71231dbb6403108ba41d2117d3ce6c6d (diff) | |
parent | 71a6b1b62041981f894cb2b6589fce92f137bbc4 (diff) | |
download | qtmultimedia-e757890f4a5669b396039211902224f31666725a.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
Diffstat (limited to 'examples/multimedia')
-rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 10 | ||||
-rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index f3bf9f805..fd73d4f16 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -237,7 +237,7 @@ InputTest::InputTest() , m_audioInfo(0) , m_audioInput(0) , m_input(0) - , m_pullMode(false) + , m_pullMode(true) , m_buffer(BufferSize, 0) { initializeWindow(); @@ -291,8 +291,6 @@ void InputTest::initializeWindow() void InputTest::initializeAudio() { - m_pullMode = true; - m_format.setSampleRate(8000); m_format.setChannelCount(1); m_format.setSampleSize(16); @@ -300,12 +298,14 @@ void InputTest::initializeAudio() m_format.setByteOrder(QAudioFormat::LittleEndian); m_format.setCodec("audio/pcm"); - QAudioDeviceInfo info(QAudioDeviceInfo::defaultInputDevice()); + QAudioDeviceInfo info(m_device); if (!info.isFormatSupported(m_format)) { qWarning() << "Default format not supported - trying to use nearest"; m_format = info.nearestFormat(m_format); } + if (m_audioInfo) + delete m_audioInfo; m_audioInfo = new AudioInfo(m_format, this); connect(m_audioInfo, SIGNAL(update()), SLOT(refreshDisplay())); @@ -381,7 +381,7 @@ void InputTest::deviceChanged(int index) delete m_audioInput; m_device = m_deviceBox->itemData(index).value<QAudioDeviceInfo>(); - createAudioInput(); + initializeAudio(); } void InputTest::sliderChanged(int value) diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 9368a611e..a00ffbb00 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -167,6 +167,7 @@ AudioTest::AudioTest() , m_generator(0) , m_audioOutput(0) , m_output(0) + , m_pullMode(true) , m_buffer(BufferSize, 0) { initializeWindow(); @@ -222,8 +223,6 @@ void AudioTest::initializeAudio() { connect(m_pushTimer, SIGNAL(timeout()), SLOT(pushTimerExpired())); - m_pullMode = true; - m_format.setSampleRate(DataSampleRateHz); m_format.setChannelCount(1); m_format.setSampleSize(16); @@ -231,12 +230,14 @@ void AudioTest::initializeAudio() m_format.setByteOrder(QAudioFormat::LittleEndian); m_format.setSampleType(QAudioFormat::SignedInt); - QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice()); + QAudioDeviceInfo info(m_device); if (!info.isFormatSupported(m_format)) { qWarning() << "Default format not supported - trying to use nearest"; m_format = info.nearestFormat(m_format); } + if (m_generator) + delete m_generator; m_generator = new Generator(m_format, DurationSeconds*1000000, ToneSampleRateHz, this); createAudioOutput(); @@ -264,7 +265,7 @@ void AudioTest::deviceChanged(int index) m_audioOutput->stop(); m_audioOutput->disconnect(this); m_device = m_deviceBox->itemData(index).value<QAudioDeviceInfo>(); - createAudioOutput(); + initializeAudio(); } void AudioTest::volumeChanged(int value) |