summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-18 16:37:11 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-18 16:37:11 (GMT)
commitedbacbac16b23b91209b3216505c873fbf87d1a2 (patch)
treeb02b0afa0bcdf80ce1daf18b88004556e63aeae6 /examples/multimedia
parent28610950d2efb0b543ede40512f6172c37c78698 (diff)
downloadQt-edbacbac16b23b91209b3216505c873fbf87d1a2.zip
Qt-edbacbac16b23b91209b3216505c873fbf87d1a2.tar.gz
Qt-edbacbac16b23b91209b3216505c873fbf87d1a2.tar.bz2
Pass QAudioDeviceInfo when creating audio input/output in examples
Reviewed-by: trustme
Diffstat (limited to 'examples/multimedia')
-rw-r--r--examples/multimedia/audioinput/audioinput.cpp2
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 8a97640..b01a396 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -208,6 +208,7 @@ InputTest::InputTest()
, m_modeButton(0)
, m_suspendResumeButton(0)
, m_deviceBox(0)
+ , m_device(QAudioDeviceInfo::defaultInputDevice())
, m_audioInfo(0)
, m_audioInput(0)
, m_input(0)
@@ -279,7 +280,6 @@ void InputTest::initializeAudio()
void InputTest::createAudioInput()
{
-
m_audioInput = new QAudioInput(m_device, m_format, this);
connect(m_audioInput, SIGNAL(notify()), SLOT(notified()));
connect(m_audioInput, SIGNAL(stateChanged(QAudio::State)), SLOT(stateChanged(QAudio::State)));
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 4866d36..cbadf02 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -160,6 +160,7 @@ AudioTest::AudioTest()
, m_modeButton(0)
, m_suspendResumeButton(0)
, m_deviceBox(0)
+ , m_device(QAudioDeviceInfo::defaultOutputDevice())
, m_generator(0)
, m_audioOutput(0)
, m_output(0)
@@ -226,7 +227,7 @@ void AudioTest::createAudioOutput()
{
delete m_audioOutput;
m_audioOutput = 0;
- m_audioOutput = new QAudioOutput(m_format, this);
+ m_audioOutput = new QAudioOutput(m_device, m_format, this);
connect(m_audioOutput, SIGNAL(notify()), SLOT(notified()));
connect(m_audioOutput, SIGNAL(stateChanged(QAudio::State)), SLOT(stateChanged(QAudio::State)));
m_generator->start();