Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into temp1

Browse source
This commit is contained in:
Sam Gateau 2015-04-06 12:24:41 -07:00
commit 4abc760db1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/audio-client/src/AudioClient.cpp
View file

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