From f9b58837d042d66b06767abd82b735b3276928e1 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 14 Oct 2026 00:58:52 -0400 Subject: [PATCH] Fix microphone capture in DirectAudio games (#747) --- .../launcher/session/SessionService.kt | 2 ++ .../overlay/usr/local/bin/droiddeck-game-env | 3 +++ tools/tests/test_game_environment.py | 21 +++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 1de3c745c7..e49b69a0c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -560,6 +560,8 @@ class SessionService : Service() { SessionPrefs.directAudio(this) val wantsMic = SessionPrefs.micEnabled(this) && checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED + guest.add("BL_MIC_ENABLED=" + if (wantsMic) "1" else "0") + guest.add("BANNER_AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0") val audioDir = File(filesDir, "directaudio").apply { mkdirs() } val relaySocket = File(audioDir, "relay.sock") val micFifo = if (wantsMic) File(audioDir, "mic.fifo") else null diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index f74779c861..e593f9b04d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -300,6 +300,7 @@ def main(): if not command: return 2 env = os.environ.copy() + mic_enabled = env.get("BL_MIC_ENABLED") mark_install_scripts(command, env) app_id = game_id(env) if app_id: @@ -328,6 +329,8 @@ def main(): env = apply_config(env, {"version": 1}, app_id, fixes) except (OSError, ValueError, TypeError, AttributeError): print("droiddeck-game-env: invalid configuration; using inherited environment", file=sys.stderr) + if mic_enabled == "0": + env["BANNER_AUDIO_DIRECT_MIC"] = "0" env = force_ssbs(command, env) command, env = start_without_steam(command, env, app_id) sync = load_sync() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index c8895457ce..9aa2f93a60 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -43,6 +43,27 @@ class ReadConfigMappingTest(unittest.TestCase): class GameEnvironmentTest(unittest.TestCase): + def test_directaudio_capture_follows_the_session_microphone_setting(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + probe = home / "probe" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('BANNER_AUDIO_DIRECT_MIC', 'unset'))\n") + probe.chmod(0o755) + config = home / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + for enabled, override, expected in (("1", None, "1"), ("0", "1", "0"), ("1", "0", "0")): + with self.subTest(enabled=enabled, override=override): + profile = {} if override is None else { + "BANNER_AUDIO_DIRECT_MIC": override, "BL_MIC_ENABLED": override, + } + config.write_text(json.dumps({"version": 1, "games": {"42": profile}})) + env = dict(os.environ, HOME=tmp, BL_MIC_ENABLED=enabled, + BANNER_AUDIO_DIRECT_MIC="1", STEAM_COMPAT_DATA_PATH="/compatdata/42") + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), + str(probe), "waitforexitandrun"], + env=env, text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), expected) + def test_the_install_script_evaluator_gets_its_scripts_marked_first(self): with tempfile.TemporaryDirectory() as tmp: root = Path(tmp)