From 3c77f48cc745eb39aa0215d4dddb1d5a681a80a7 Mon Sep 17 00:00:00 2001 From: Kartik K Khullar Date: Thu, 8 Sep 2022 20:40:52 +0200 Subject: [PATCH 1/2] FEAT(client): Warn for pos. audio with mono output As requested in #5238 this commit adds a warning message in the chat when positional audio is enabled on mono output device. Fixes #5238 --- src/mumble/AudioOutput.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index ca7f48b77..07a5d7dae 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -10,6 +10,7 @@ #include "AudioOutputSpeech.h" #include "Channel.h" #include "ChannelListenerManager.h" +#include "Log.h" #include "PluginManager.h" #include "ServerHandler.h" #include "Timer.h" @@ -344,6 +345,10 @@ void AudioOutput::initializeMixer(const unsigned int *chanmasks, bool forceheadp } iSampleSize = static_cast< int >(iChannels * ((eSampleFormat == SampleFloat) ? sizeof(float) : sizeof(short))); qWarning("AudioOutput: Initialized %d channel %d hz mixer", iChannels, iMixerFreq); + + if (Global::get().s.bPositionalAudio && iChannels == 1) { + Global::get().l->logOrDefer(Log::Warning, tr("Positional audio cannot work with mono output devices!")); + } } bool AudioOutput::mix(void *outbuff, unsigned int frameCount) { From 70082df9e676677c05bc9e1d5fb6bc95c0efeba9 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Thu, 8 Sep 2022 20:43:13 +0200 Subject: [PATCH 2/2] TRANSLATION: Update translation files --- src/mumble/mumble_ar.ts | 4 ++++ src/mumble/mumble_bg.ts | 4 ++++ src/mumble/mumble_br.ts | 4 ++++ src/mumble/mumble_ca.ts | 4 ++++ src/mumble/mumble_cs.ts | 4 ++++ src/mumble/mumble_cy.ts | 4 ++++ src/mumble/mumble_da.ts | 4 ++++ src/mumble/mumble_de.ts | 4 ++++ src/mumble/mumble_el.ts | 4 ++++ src/mumble/mumble_en.ts | 4 ++++ src/mumble/mumble_en_GB.ts | 4 ++++ src/mumble/mumble_eo.ts | 4 ++++ src/mumble/mumble_es.ts | 4 ++++ src/mumble/mumble_et.ts | 4 ++++ src/mumble/mumble_eu.ts | 4 ++++ src/mumble/mumble_fa_IR.ts | 4 ++++ src/mumble/mumble_fi.ts | 4 ++++ src/mumble/mumble_fr.ts | 4 ++++ src/mumble/mumble_gl.ts | 4 ++++ src/mumble/mumble_he.ts | 4 ++++ src/mumble/mumble_hu.ts | 4 ++++ src/mumble/mumble_it.ts | 4 ++++ src/mumble/mumble_ja.ts | 4 ++++ src/mumble/mumble_ko.ts | 4 ++++ src/mumble/mumble_lt.ts | 4 ++++ src/mumble/mumble_nl.ts | 4 ++++ src/mumble/mumble_no.ts | 4 ++++ src/mumble/mumble_oc.ts | 4 ++++ src/mumble/mumble_pl.ts | 4 ++++ src/mumble/mumble_pt_BR.ts | 4 ++++ src/mumble/mumble_pt_PT.ts | 4 ++++ src/mumble/mumble_ro.ts | 4 ++++ src/mumble/mumble_ru.ts | 4 ++++ src/mumble/mumble_si.ts | 4 ++++ src/mumble/mumble_sk.ts | 4 ++++ src/mumble/mumble_sq.ts | 4 ++++ src/mumble/mumble_sv.ts | 4 ++++ src/mumble/mumble_te.ts | 4 ++++ src/mumble/mumble_th.ts | 4 ++++ src/mumble/mumble_tr.ts | 4 ++++ src/mumble/mumble_uk.ts | 4 ++++ src/mumble/mumble_zh_CN.ts | 4 ++++ src/mumble/mumble_zh_HK.ts | 4 ++++ src/mumble/mumble_zh_TW.ts | 4 ++++ 44 files changed, 176 insertions(+) diff --git a/src/mumble/mumble_ar.ts b/src/mumble/mumble_ar.ts index df3453e1c..40d884c9e 100644 --- a/src/mumble/mumble_ar.ts +++ b/src/mumble/mumble_ar.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_bg.ts b/src/mumble/mumble_bg.ts index 33019ff85..868d23678 100644 --- a/src/mumble/mumble_bg.ts +++ b/src/mumble/mumble_bg.ts @@ -1429,6 +1429,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_br.ts b/src/mumble/mumble_br.ts index 0d6bfc820..a63cf4730 100644 --- a/src/mumble/mumble_br.ts +++ b/src/mumble/mumble_br.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_ca.ts b/src/mumble/mumble_ca.ts index 91077cc3c..e88e0c41e 100644 --- a/src/mumble/mumble_ca.ts +++ b/src/mumble/mumble_ca.ts @@ -1436,6 +1436,10 @@ Aquest valor us permet establir el nombre màxim d'usuaris permesos al cana m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts index 9715306bf..00ac81f1b 100644 --- a/src/mumble/mumble_cs.ts +++ b/src/mumble/mumble_cs.ts @@ -1436,6 +1436,10 @@ Tato hodnota Vám umožňuje nastavit maximální počet povolených uživatelů m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_cy.ts b/src/mumble/mumble_cy.ts index 7f0b396c9..38a584fb5 100644 --- a/src/mumble/mumble_cy.ts +++ b/src/mumble/mumble_cy.ts @@ -1429,6 +1429,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts index 6af87453b..e4895bad3 100644 --- a/src/mumble/mumble_da.ts +++ b/src/mumble/mumble_da.ts @@ -1435,6 +1435,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts index a0d9df787..59e82b49e 100644 --- a/src/mumble/mumble_de.ts +++ b/src/mumble/mumble_de.ts @@ -1436,6 +1436,10 @@ Dieser Wert erlaubt das Einstellen der maximal im Kanal erlaubten Benutzeranzahl m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_el.ts b/src/mumble/mumble_el.ts index e2ff9ad56..1af15057c 100644 --- a/src/mumble/mumble_el.ts +++ b/src/mumble/mumble_el.ts @@ -1436,6 +1436,10 @@ This value allows you to set the maximum number of users allowed in the channel. m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts index 5d528a845..43250151d 100644 --- a/src/mumble/mumble_en.ts +++ b/src/mumble/mumble_en.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_en_GB.ts b/src/mumble/mumble_en_GB.ts index 00bbda3ce..1340c70ea 100644 --- a/src/mumble/mumble_en_GB.ts +++ b/src/mumble/mumble_en_GB.ts @@ -1436,6 +1436,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_eo.ts b/src/mumble/mumble_eo.ts index b1676b2cf..461e8c155 100644 --- a/src/mumble/mumble_eo.ts +++ b/src/mumble/mumble_eo.ts @@ -1436,6 +1436,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts index 5474e4090..8db576087 100644 --- a/src/mumble/mumble_es.ts +++ b/src/mumble/mumble_es.ts @@ -1436,6 +1436,10 @@ Este valor permite fijar el número máximo de usuarios permitidos en el canal. m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_et.ts b/src/mumble/mumble_et.ts index 08a6687b6..679b93139 100644 --- a/src/mumble/mumble_et.ts +++ b/src/mumble/mumble_et.ts @@ -1429,6 +1429,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_eu.ts b/src/mumble/mumble_eu.ts index 3618c7ad6..0ebd47ad8 100644 --- a/src/mumble/mumble_eu.ts +++ b/src/mumble/mumble_eu.ts @@ -1438,6 +1438,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_fa_IR.ts b/src/mumble/mumble_fa_IR.ts index 3ab22ccdb..3085d5a61 100644 --- a/src/mumble/mumble_fa_IR.ts +++ b/src/mumble/mumble_fa_IR.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_fi.ts b/src/mumble/mumble_fi.ts index 7a5cb4d79..27f0a0b3b 100644 --- a/src/mumble/mumble_fi.ts +++ b/src/mumble/mumble_fi.ts @@ -1436,6 +1436,10 @@ Tämän numeron ollessa suurempi kuin nolla kanava sallii enintään numeron suu m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts index b4946ceab..c96b62ef1 100644 --- a/src/mumble/mumble_fr.ts +++ b/src/mumble/mumble_fr.ts @@ -1436,6 +1436,10 @@ Cette valeur vous permet de définir un nombre maximum d'utilisateurs autor m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_gl.ts b/src/mumble/mumble_gl.ts index 7229f396f..914493b88 100644 --- a/src/mumble/mumble_gl.ts +++ b/src/mumble/mumble_gl.ts @@ -1430,6 +1430,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_he.ts b/src/mumble/mumble_he.ts index ac3720ef1..a8d1037b2 100644 --- a/src/mumble/mumble_he.ts +++ b/src/mumble/mumble_he.ts @@ -1437,6 +1437,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_hu.ts b/src/mumble/mumble_hu.ts index 3cc73c10d..85d376859 100644 --- a/src/mumble/mumble_hu.ts +++ b/src/mumble/mumble_hu.ts @@ -1432,6 +1432,10 @@ This value allows you to set the maximum number of users allowed in the channel. m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts index be7b214b0..d05267b31 100644 --- a/src/mumble/mumble_it.ts +++ b/src/mumble/mumble_it.ts @@ -1436,6 +1436,10 @@ Questo valore ti permette di impostare il numero massimo di utenti consentiti ne m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts index 49a0023a3..0e7cc4411 100644 --- a/src/mumble/mumble_ja.ts +++ b/src/mumble/mumble_ja.ts @@ -1437,6 +1437,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_ko.ts b/src/mumble/mumble_ko.ts index 6c3d77f1b..b09c3beb6 100644 --- a/src/mumble/mumble_ko.ts +++ b/src/mumble/mumble_ko.ts @@ -1436,6 +1436,10 @@ This value allows you to set the maximum number of users allowed in the channel. m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_lt.ts b/src/mumble/mumble_lt.ts index 3e6222b3b..01cac5fec 100644 --- a/src/mumble/mumble_lt.ts +++ b/src/mumble/mumble_lt.ts @@ -1431,6 +1431,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_nl.ts b/src/mumble/mumble_nl.ts index 36aaf464a..0249ce710 100644 --- a/src/mumble/mumble_nl.ts +++ b/src/mumble/mumble_nl.ts @@ -1436,6 +1436,10 @@ Deze waarde laat je toe om een maximum aantal gebruikers in te stellen voor het m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_no.ts b/src/mumble/mumble_no.ts index 4eb76ecf3..7039e3f1a 100644 --- a/src/mumble/mumble_no.ts +++ b/src/mumble/mumble_no.ts @@ -1438,6 +1438,10 @@ Når du er lenger unna enn dette vil andres stemme ikke bli dempet ytterligere.< m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_oc.ts b/src/mumble/mumble_oc.ts index 73cd8af57..eff089722 100644 --- a/src/mumble/mumble_oc.ts +++ b/src/mumble/mumble_oc.ts @@ -1429,6 +1429,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts index 26f99a797..6e1ea6b31 100644 --- a/src/mumble/mumble_pl.ts +++ b/src/mumble/mumble_pl.ts @@ -1436,6 +1436,10 @@ Określa maksymalną dozwoloną liczbę użytkowników na tym kanale. Jeżeli wa m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_pt_BR.ts b/src/mumble/mumble_pt_BR.ts index 0da531769..0e1c8d445 100644 --- a/src/mumble/mumble_pt_BR.ts +++ b/src/mumble/mumble_pt_BR.ts @@ -1436,6 +1436,10 @@ Este valor permite que você especifique o número máximo de usuárias permitid m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_pt_PT.ts b/src/mumble/mumble_pt_PT.ts index 8e630aba6..e773486d3 100644 --- a/src/mumble/mumble_pt_PT.ts +++ b/src/mumble/mumble_pt_PT.ts @@ -1436,6 +1436,10 @@ Este valor permite definir o número máximo de utilizadores permitido no canal. m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_ro.ts b/src/mumble/mumble_ro.ts index 48d7474c3..e60d610a8 100644 --- a/src/mumble/mumble_ro.ts +++ b/src/mumble/mumble_ro.ts @@ -1432,6 +1432,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts index 005a83d34..17b35e572 100644 --- a/src/mumble/mumble_ru.ts +++ b/src/mumble/mumble_ru.ts @@ -1436,6 +1436,10 @@ This value allows you to set the maximum number of users allowed in the channel. m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_si.ts b/src/mumble/mumble_si.ts index e3380075c..4b4997d1b 100644 --- a/src/mumble/mumble_si.ts +++ b/src/mumble/mumble_si.ts @@ -1422,6 +1422,10 @@ Contains the list of members inherited by the current channel. Uncheck <i> m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_sk.ts b/src/mumble/mumble_sk.ts index 0a44b67b7..da40b1276 100644 --- a/src/mumble/mumble_sk.ts +++ b/src/mumble/mumble_sk.ts @@ -1422,6 +1422,10 @@ Contains the list of members inherited by the current channel. Uncheck <i> <b>This enables one of the loopback test modes.</b><br /><i>None</i> - Loopback disabled<br /><i>Local</i> - Emulate a local server.<br /><i>Server</i> - Request loopback from server.<br />Please note than when loopback is enabled, no other users will hear your voice. This setting is not saved on application exit. + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_sq.ts b/src/mumble/mumble_sq.ts index 7640282d1..3a8124009 100644 --- a/src/mumble/mumble_sq.ts +++ b/src/mumble/mumble_sq.ts @@ -1424,6 +1424,10 @@ Contains the list of members inherited by the current channel. Uncheck <i> m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_sv.ts b/src/mumble/mumble_sv.ts index 14faddb23..2a2ae50a1 100644 --- a/src/mumble/mumble_sv.ts +++ b/src/mumble/mumble_sv.ts @@ -1436,6 +1436,10 @@ Det värdet tillåter dig att ställa in ett maximalt antal av användare som ä m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_te.ts b/src/mumble/mumble_te.ts index 0038a48b0..05a3c3756 100644 --- a/src/mumble/mumble_te.ts +++ b/src/mumble/mumble_te.ts @@ -1434,6 +1434,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_th.ts b/src/mumble/mumble_th.ts index 89d52cd72..c131a8ca6 100644 --- a/src/mumble/mumble_th.ts +++ b/src/mumble/mumble_th.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_tr.ts b/src/mumble/mumble_tr.ts index bfe2d41eb..e7e1f127a 100644 --- a/src/mumble/mumble_tr.ts +++ b/src/mumble/mumble_tr.ts @@ -1436,6 +1436,10 @@ Bu değer kanalda izin verilen azami kullanıcı sayısını ayarlamanıza izin m m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_uk.ts b/src/mumble/mumble_uk.ts index 0af09791f..13f597aa8 100644 --- a/src/mumble/mumble_uk.ts +++ b/src/mumble/mumble_uk.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts index 344f3d9f3..2f7c4f53b 100644 --- a/src/mumble/mumble_zh_CN.ts +++ b/src/mumble/mumble_zh_CN.ts @@ -1436,6 +1436,10 @@ This value allows you to set the maximum number of users allowed in the channel. m 米 + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_zh_HK.ts b/src/mumble/mumble_zh_HK.ts index f1e8b0fe7..2e48845ec 100644 --- a/src/mumble/mumble_zh_HK.ts +++ b/src/mumble/mumble_zh_HK.ts @@ -1428,6 +1428,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts index 55645b900..ff64f04ab 100644 --- a/src/mumble/mumble_zh_TW.ts +++ b/src/mumble/mumble_zh_TW.ts @@ -1431,6 +1431,10 @@ This value allows you to set the maximum number of users allowed in the channel. m + + Positional audio cannot work with mono output devices! + + AudioOutputDialog