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

Merge pull request #347 from JulianGro/audio

Browse source 
Throw warning on empty audio device list
This commit is contained in:
Julian Groß 2023-03-18 21:13:15 +01:00 committed by GitHub
commit ad05086a9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -1,7 +1,7 @@
# https://www.git-scm.com/docs/gitignore # https://www.git-scm.com/docs/gitignore
# #
# Copyright 2013-2019 High Fidelity, Inc. # Copyright 2013-2019 High Fidelity, Inc.
# Copyright 2022 Overte e.V. # Copyright 2022-2023 Overte e.V.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
VideoDecodeStats VideoDecodeStats
@ -66,6 +66,10 @@ profile
DerivedData DerivedData
.idea/ .idea/
# KDevelop
*~
*.kdev4
*.hmap *.hmap
# ignore interface optional externals # ignore interface optional externals

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

@ -1,13 +1,15 @@
// //
// AudioClient.cpp // AudioClient.cpp
// interface/src // libraries/audio-client/src
// //
// Created by Stephen Birarda on 1/22/13. // Created by Stephen Birarda on 1/22/13.
// Copyright 2013 High Fidelity, Inc. // Copyright 2013 High Fidelity, Inc.
// Copyright 2021 Vircadia contributors. // Copyright 2021 Vircadia contributors.
// Copyright 2023 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// SPDX-License-Identifier: Apache-2.0
// //
#include "AudioClient.h" #include "AudioClient.h"
@ -118,7 +120,7 @@ QList<HifiAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode, const QString&
newDevices.push_front(HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop)); newDevices.push_front(HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop));
} else { } else {
//current audio list is empty for some reason. //current audio list is empty for some reason.
qCDebug(audioclient) << __FUNCTION__ << "Default device not found in list no alternative selection available"; qCWarning(audioclient) << __FUNCTION__ << "Default device not found in list and no alternative selection available";
} }
} else { } else {
newDevices.push_front(defaultDesktopDevice); newDevices.push_front(defaultDesktopDevice);
@ -877,7 +879,7 @@ void AudioClient::handleAudioDataPacket(QSharedPointer<ReceivedMessage> message)
emit receivedFirstPacket(); emit receivedFirstPacket();
} }
#if DEV_BUILD || PR_BUILD #if defined(DEV_BUILD) || defined(PR_BUILD)
_gate.insert(message); _gate.insert(message);
#else #else
// Audio output must exist and be correctly set up if we're going to process received audio // Audio output must exist and be correctly set up if we're going to process received audio