Merge pull request #4598 from sethalves/fix-linux-audio

avoid repeatedly calling QAudioDeviceInfo::availableDevices on linux
This commit is contained in:
Andrew Meadows 2015-04-06 10:51:24 -07:00
commit f51a259909

View file

@ -1281,6 +1281,9 @@ qint64 AudioClient::AudioOutputIODevice::readData(char * data, qint64 maxSize) {
}
void AudioClient::checkDevices() {
# ifdef Q_OS_LINUX
// on linux, this makes the audio stream hiccup
# else
QVector<QString> inputDevices = getDeviceNames(QAudio::AudioInput);
QVector<QString> outputDevices = getDeviceNames(QAudio::AudioOutput);
@ -1290,6 +1293,7 @@ void AudioClient::checkDevices() {
emit deviceChanged();
}
# endif
}
void AudioClient::loadSettings() {