From 34ab2b5369feac066aa5c16c368bbb9360584d6f Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Fri, 13 Jun 2014 16:48:36 +0200 Subject: Improved audiooutput and audioinput examples. Always show the default audio device first in the drop-down box. Change-Id: Icbafa9e316fd330fe7a9801a8e2efef6f20ff054 Reviewed-by: Christian Stromme --- examples/multimedia/audioinput/audioinput.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'examples/multimedia/audioinput') diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 4f9408a6d..09f571b0c 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -255,9 +255,12 @@ void InputTest::initializeWindow() layout->addWidget(m_canvas); m_deviceBox = new QComboBox(this); - QList devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput); - for(int i = 0; i < devices.size(); ++i) - m_deviceBox->addItem(devices.at(i).deviceName(), qVariantFromValue(devices.at(i))); + const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultInputDevice(); + m_deviceBox->addItem(defaultDeviceInfo.deviceName(), qVariantFromValue(defaultDeviceInfo)); + foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioInput)) { + if (deviceInfo != defaultDeviceInfo) + m_deviceBox->addItem(deviceInfo.deviceName(), qVariantFromValue(deviceInfo)); + } connect(m_deviceBox, SIGNAL(activated(int)), SLOT(deviceChanged(int))); layout->addWidget(m_deviceBox); -- cgit v1.2.3