slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3' into dev

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: Ic2b4c2bf7b985c97d75d70980413da4f569f207a
This commit is contained in:
Frederik Gladhorn
2014-06-26 17:25:12 +02:00
parent 310402c6c1 1d73904b25
commit dfd00bca7e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/multimedia/audioinput/audioinput.cpp
View File

@@ -255,9 +255,12 @@ void InputTest::initializeWindow()
layout->addWidget(m_canvas); layout->addWidget(m_canvas);
m_deviceBox = new QComboBox(this); m_deviceBox = new QComboBox(this);
QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput); const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultInputDevice();
for(int i = 0; i < devices.size(); ++i) m_deviceBox->addItem(defaultDeviceInfo.deviceName(), qVariantFromValue(defaultDeviceInfo));
m_deviceBox->addItem(devices.at(i).deviceName(), qVariantFromValue(devices.at(i))); 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))); connect(m_deviceBox, SIGNAL(activated(int)), SLOT(deviceChanged(int)));
layout->addWidget(m_deviceBox); layout->addWidget(m_deviceBox);

8
examples/multimedia/audiooutput/audiooutput.cpp
View File

@@ -176,8 +176,12 @@ void AudioTest::initializeWindow()
QScopedPointer<QVBoxLayout> layout(new QVBoxLayout); QScopedPointer<QVBoxLayout> layout(new QVBoxLayout);
m_deviceBox = new QComboBox(this); m_deviceBox = new QComboBox(this);
foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultOutputDevice();
m_deviceBox->addItem(deviceInfo.deviceName(), qVariantFromValue(deviceInfo)); 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))); connect(m_deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));
layout->addWidget(m_deviceBox); layout->addWidget(m_deviceBox);