From 88a0d6217eb59a6d75c5a20dedcb388f6b73d9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 12 Mar 2023 16:35:55 +0100 Subject: [PATCH 1/3] Throw warning if audio devices list is empty instead of debug message. --- libraries/audio-client/src/AudioClient.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index eb6820421d..d39caa8c3f 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -1,13 +1,15 @@ // // AudioClient.cpp -// interface/src +// libraries/audio-client/src // // Created by Stephen Birarda on 1/22/13. // Copyright 2013 High Fidelity, Inc. // Copyright 2021 Vircadia contributors. +// Copyright 2023 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// SPDX-License-Identifier: Apache-2.0 // #include "AudioClient.h" @@ -118,7 +120,7 @@ QList getAvailableDevices(QAudio::Mode mode, const QString& newDevices.push_front(HifiAudioDeviceInfo(devices.first(), true, mode, HifiAudioDeviceInfo::desktop)); } else { //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 { newDevices.push_front(defaultDesktopDevice); From 40cdeec4d9b216fd998b07fe0ead7e31f6364ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 12 Mar 2023 16:36:14 +0100 Subject: [PATCH 2/3] Fix "Invalid token at start of a preprocessor expression" --- libraries/audio-client/src/AudioClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index d39caa8c3f..6eb77da4d7 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -879,7 +879,7 @@ void AudioClient::handleAudioDataPacket(QSharedPointer message) emit receivedFirstPacket(); } -#if DEV_BUILD || PR_BUILD +#if defined(DEV_BUILD) || defined(PR_BUILD) _gate.insert(message); #else // Audio output must exist and be correctly set up if we're going to process received audio From 09a88a5d0f899f824e38d5f4697d9c6823b78c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 12 Mar 2023 16:38:32 +0100 Subject: [PATCH 3/3] Add KDevelop to gitignore --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b5a419f9ae..acb3414800 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # https://www.git-scm.com/docs/gitignore # # Copyright 2013-2019 High Fidelity, Inc. -# Copyright 2022 Overte e.V. +# Copyright 2022-2023 Overte e.V. # SPDX-License-Identifier: Apache-2.0 VideoDecodeStats @@ -66,6 +66,10 @@ profile DerivedData .idea/ +# KDevelop +*~ +*.kdev4 + *.hmap # ignore interface optional externals