summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audiooutput
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-06-13 16:48:36 +0200
committerYoann Lopes <yoann.lopes@digia.com>2014-06-16 13:43:05 +0200
commit34ab2b5369feac066aa5c16c368bbb9360584d6f (patch)
tree060a163ede3b7382e3a6d4ae01b550cd0ceba1a6 /examples/multimedia/audiooutput
parent150ff6662de1312e3ba9d000895d80dd5805ea5b (diff)
Improved audiooutput and audioinput examples.
Always show the default audio device first in the drop-down box. Change-Id: Icbafa9e316fd330fe7a9801a8e2efef6f20ff054 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'examples/multimedia/audiooutput')
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 847f72dff..fdb640dc2 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -176,8 +176,12 @@ void AudioTest::initializeWindow()
QScopedPointer<QVBoxLayout> layout(new QVBoxLayout);
m_deviceBox = new QComboBox(this);
- foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
- m_deviceBox->addItem(deviceInfo.deviceName(), qVariantFromValue(deviceInfo));
+ const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultOutputDevice();
+ m_deviceBox->addItem(defaultDeviceInfo.deviceName(), qVariantFromValue(defaultDeviceInfo));
+ foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) {
+ if (deviceInfo != defaultDeviceInfo)
+ m_deviceBox->addItem(deviceInfo.deviceName(), qVariantFromValue(deviceInfo));
+ }
connect(m_deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));
layout->addWidget(m_deviceBox);