Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 08:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed issue with null device on load.

Browse source
This commit is contained in:
amer cerkic 2019-09-18 12:44:03 -07:00
parent 46b9496965
commit d4dc06d2e7
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -481,6 +481,19 @@ void AudioClient::setAudioPaused(bool pause) {
} }
} }
HifiAudioDeviceInfo AudioClient::getNamedAudioDevice(QAudio::Mode mode, const QString& deviceName) {
HifiAudioDeviceInfo result;
foreach(HifiAudioDeviceInfo audioDevice, getAudioDevices(mode)) {
if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
result = audioDevice;
break;
}
}
return result;
}
HifiAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) { HifiAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) {
HifiAudioDeviceInfo result; HifiAudioDeviceInfo result;
foreach (HifiAudioDeviceInfo audioDevice, getAvailableDevices(mode)) { foreach (HifiAudioDeviceInfo audioDevice, getAvailableDevices(mode)) {
@ -1043,7 +1056,7 @@ bool AudioClient::switchAudioDevice(QAudio::Mode mode, const HifiAudioDeviceInfo
} }
bool AudioClient::switchAudioDevice(QAudio::Mode mode, const QString& deviceName) { bool AudioClient::switchAudioDevice(QAudio::Mode mode, const QString& deviceName) {
return switchAudioDevice(mode, getNamedAudioDeviceForMode(mode, deviceName)); return switchAudioDevice(mode, getNamedAudioDevice(mode, deviceName));
} }
void AudioClient::configureReverb() { void AudioClient::configureReverb() {

2
libraries/audio-client/src/AudioClient.h
View file

@ -126,6 +126,8 @@ public:
const MixedProcessedAudioStream& getReceivedAudioStream() const { return _receivedAudioStream; } const MixedProcessedAudioStream& getReceivedAudioStream() const { return _receivedAudioStream; }
MixedProcessedAudioStream& getReceivedAudioStream() { return _receivedAudioStream; } MixedProcessedAudioStream& getReceivedAudioStream() { return _receivedAudioStream; }
HifiAudioDeviceInfo getNamedAudioDevice(QAudio::Mode mode, const QString& deviceName);
const QAudioFormat& getOutputFormat() const { return _outputFormat; } const QAudioFormat& getOutputFormat() const { return _outputFormat; }