Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlemens Nanni <klemens@posteo.de>2022-01-11 13:17:55 +0300
committerRobert Adam <dev@robert-adam.de>2022-09-16 12:20:39 +0300
commit1deeafca9d623c5bbc1631401b3edecc9093334a (patch)
tree6fcdd72a68f4df67790892eee83ed9b587c514b8
parentffb171106172944dfbe99e593cb8870dfb3abf95 (diff)
BUILD(audiowizard): Fix build with -Dspeechd=OFF -Dwarnings-as-errors=ON
Move the declaration/definition of `iMessage` to where it is used, otherwise the build fails with ``` src/mumble/AudioWizard.cpp:95:10: error: variable 'iMessage' set but not used [-Werror,-Wunused-but-set-variable] quint32 iMessage = Settings::LogNone; ^ 1 error generated. ``` Build-tested on OpenBSD 7.0-CURRENT using ``` $ cc --version OpenBSD clang version 13.0.0 Target: amd64-unknown-openbsd7.0 Thread model: posix InstalledDir: /usr/bin ```
-rw-r--r--src/mumble/AudioWizard.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp
index 3c1e18d7e..d40e1fd7e 100644
--- a/src/mumble/AudioWizard.cpp
+++ b/src/mumble/AudioWizard.cpp
@@ -92,11 +92,6 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
else
qrbQualityCustom->setChecked(true);
- quint32 iMessage = Settings::LogNone;
- for (int i = Log::firstMsgType; i <= Log::lastMsgType; ++i) {
- iMessage |= (Global::get().s.qmMessages[i] & (Settings::LogSoundfile | Settings::LogTTS));
- }
-
#ifdef USE_NO_TTS
qrbNotificationCustom->setChecked(false);
qrbNotificationCustom->setDisabled(true);
@@ -104,6 +99,11 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) {
qrbNotificationTTS->setDisabled(true);
qrbNotificationSounds->setChecked(true);
#else
+ quint32 iMessage = Settings::LogNone;
+ for (int i = Log::firstMsgType; i <= Log::lastMsgType; ++i) {
+ iMessage |= (Global::get().s.qmMessages[i] & (Settings::LogSoundfile | Settings::LogTTS));
+ }
+
if (iMessage == Settings::LogTTS && Global::get().s.bTTS)
qrbNotificationTTS->setChecked(true);
else if (iMessage == Settings::LogSoundfile)