diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 412a92cf15..57f66c72cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -449,6 +449,7 @@ jobs: id: build-label env: PR_NUMBER: ${{ github.event.pull_request.number }} + PR_TITLE: ${{ github.event.pull_request.title }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} BUILD_REF: ${{ github.ref_name }} BUILD_SHA: ${{ github.sha }} @@ -467,6 +468,7 @@ jobs: echo "label=$label" >> "$GITHUB_OUTPUT" echo "DROIDDECK_SOURCE_COMMIT=${PR_HEAD_SHA:-$BUILD_SHA}" >> "$GITHUB_ENV" echo "DROIDDECK_PR_NUMBER=${PR_NUMBER:-0}" >> "$GITHUB_ENV" + echo "DROIDDECK_PR_TITLE=${PR_TITLE//$'\n'/ }" >> "$GITHUB_ENV" echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" - name: Rust toolchain for the store engines (aarch64-linux-android) diff --git a/app/build.gradle b/app/build.gradle index ed3dd9cb89..784f4f3188 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,6 +78,10 @@ def escapedBuildLabel = buildLabel.replace('\\', '\\\\').replace('"', '\\"') def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getOrNull() ?: providers.environmentVariable('GITHUB_SHA').getOrNull() ?: gitValue(['rev-parse', 'HEAD']) ?: '' def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' } +def prTitle = providers.environmentVariable('DROIDDECK_PR_TITLE').getOrNull() ?: '' +def buildBranch = providers.environmentVariable('GITHUB_HEAD_REF').getOrNull()?.trim() + ?: gitValue(['branch', '--show-current']) ?: '' +def escapeJava = { String value -> value.replace('\\', '\\\\').replace('"', '\\"').replace('\n', ' ').replace('\r', ' ') } def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() def commitTime = (gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit]) ?: '0').with { it.isLong() ? it : '0' } @@ -135,6 +139,8 @@ android { buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" buildConfigField "String", "SOURCE_COMMIT", "\"${sourceCommit}\"" buildConfigField "int", "PR_NUMBER", "${prNumber}" + buildConfigField "String", "PR_TITLE", "\"${escapeJava(prTitle)}\"" + buildConfigField "String", "BUILD_BRANCH", "\"${escapeJava(buildBranch)}\"" buildConfigField "boolean", "CI_BUILD", "${ciBuild}" buildConfigField "String", "RELEASE_SIGNER", "\"${releaseSigner}\"" buildConfigField "long", "COMMIT_TIME", "${commitTime}L * 1000L" diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index ca648e3f11..7e1be40a3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -17,6 +17,7 @@ class App : Application() { override fun onCreate() { super.onCreate() com.droiddeck.launcher.ui.Themes.loadGradient(this) + com.droiddeck.launcher.ui.BuildWatermark.install(this) // Helper processes must not initialize the main USB provider or guest graphics context. val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager) diff --git a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt new file mode 100644 index 0000000000..56fbedbe6d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.audio + +import android.media.AudioAttributes +import android.media.AudioFormat +import android.media.AudioTrack +import android.util.Log + +object DirectAudioTiming { + private const val TAG = "DirectAudioTiming" + const val PERIOD_ENV = "AUDIO_DIRECT_PERIOD_MS" + const val BUFFER_ENV = "AUDIO_DIRECT_MS" + const val SLOW_OUTPUT_PERIOD_MS = 20 + const val SLOW_OUTPUT_BUFFER_MS = 60 + + fun environment(lowLatencyOutput: Boolean): List = + if (lowLatencyOutput) emptyList() + else listOf("$PERIOD_ENV=$SLOW_OUTPUT_PERIOD_MS", "$BUFFER_ENV=$SLOW_OUTPUT_BUFFER_MS") + + fun lowLatencyOutput(): Boolean = try { + val track = AudioTrack.Builder() + .setAudioAttributes(AudioAttributes.Builder() + .setUsage(AudioAttributes.USAGE_GAME) + .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) + .build()) + .setAudioFormat(AudioFormat.Builder() + .setEncoding(AudioFormat.ENCODING_PCM_FLOAT) + .setSampleRate(48000) + .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO) + .build()) + .setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY) + .setTransferMode(AudioTrack.MODE_STREAM) + .build() + try { + track.performanceMode == AudioTrack.PERFORMANCE_MODE_LOW_LATENCY + } finally { + track.release() + } + } catch (e: Exception) { + Log.w(TAG, "audio: could not check for low-latency output; DirectAudio keeps its defaults", e) + true + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt index bcf3a0448c..5958c5e99b 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -34,6 +34,8 @@ object GameEnvironmentOptions { Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT), Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT), Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER), + Option("AUDIO_DIRECT_MS", "", 0, Type.NUMBER), + Option("AUDIO_DIRECT_PERIOD_MS", "", 0, Type.NUMBER), Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT), Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")), Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")), 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 955f45f355..b24d4a737c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -896,7 +896,7 @@ class SessionService : Service() { if (!SessionPrefs.zramClient(this)) guest.add("BL_ZRAM_CLIENT=0") } SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } - guest.add("BANNER_AUDIO_DIRECT_DECAY=0") + guest.add("AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + agentEnvironment if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) extra.forEach { guest.add(it) } @@ -945,7 +945,7 @@ class SessionService : Service() { 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") + guest.add("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 @@ -973,7 +973,11 @@ class SessionService : Service() { } if (wantsDirectAudio) { guest.add("BL_DIRECTAUDIO=/" + SessionFiles.DIRECTAUDIO_DIR) - guest.add("BANNER_AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) + guest.add("AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) + val lowLatency = com.droiddeck.launcher.audio.DirectAudioTiming.lowLatencyOutput() + val timing = com.droiddeck.launcher.audio.DirectAudioTiming.environment(lowLatency) + guest.addAll(timing) + Log.i(TAG, "audio: Android output " + (if (lowLatency) "is low-latency; DirectAudio keeps its defaults" else "is not low-latency; DirectAudio uses " + timing.joinToString(" "))) } Log.i(TAG, "audio: client DirectAudio (in-process sink)" + (if (wantsDirectAudio) " + DirectAudio for games" else "") + (if (wantsMic) " + microphone" else "") + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt new file mode 100644 index 0000000000..f2a9e8f65b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -0,0 +1,113 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Typeface +import android.os.Bundle +import android.text.TextPaint +import android.text.TextUtils +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.QuestXrActivity + +/** A faint bottom-right tag on every screen of a test or local build; stable and preview builds draw none. */ +object BuildWatermark { + private const val TITLE_LIMIT = 80 + + fun lines( + pr: Int = BuildConfig.PR_NUMBER, + ci: Boolean = BuildConfig.CI_BUILD, + commit: String = BuildConfig.SOURCE_COMMIT, + title: String = BuildConfig.PR_TITLE, + branch: String = BuildConfig.BUILD_BRANCH, + ): List? { + if (ci && pr <= 0) return null + val hash = commit.take(7).ifEmpty { "unknown" } + val head = if (pr > 0) "PR-$pr | $hash" else "LOCAL | $hash" + val detail = (if (pr > 0) title else branch).trim() + return if (detail.isEmpty()) listOf(head) else listOf(head, truncate(detail)) + } + + private fun truncate(text: String) = + if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" + + fun install(app: Application) { + val lines = lines() ?: return + app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { + if (activity is QuestXrActivity) return + val decor = activity.window.decorView as? ViewGroup ?: return + if (decor.findViewWithTag(TAG) != null) return + val margin = (8 * activity.resources.displayMetrics.density).toInt() + decor.addView( + MarkView(activity, lines).apply { tag = TAG }, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or Gravity.END, + ).apply { setMargins(margin, margin, margin, margin) }, + ) + } + + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + }) + } + + private const val TAG = "build-watermark" + + private class MarkView(context: Context, private val lines: List) : View(context) { + private var shown = lines + private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply { + color = 0xE6FFFFFF.toInt() + typeface = Typeface.MONOSPACE + textSize = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, 9f, context.resources.displayMetrics, + ) + setShadowLayer(1.5f * context.resources.displayMetrics.density, 0f, 0f, 0xFF000000.toInt()) + textAlign = Paint.Align.RIGHT + } + private val backdrop = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = 0x66303030 } + private val lineHeight get() = paint.fontSpacing + + init { + isClickable = false + isFocusable = false + importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO + setLayerType(LAYER_TYPE_SOFTWARE, null) + } + + override fun onMeasure(widthSpec: Int, heightSpec: Int) { + val pad = paddingForShadow() * 2 + val limit = if (MeasureSpec.getMode(widthSpec) == MeasureSpec.UNSPECIFIED) Float.MAX_VALUE + else (MeasureSpec.getSize(widthSpec) - pad).coerceAtLeast(0).toFloat() + shown = lines.map { TextUtils.ellipsize(it, paint, limit, TextUtils.TruncateAt.END).toString() } + val width = shown.maxOf { paint.measureText(it) }.toInt() + pad + setMeasuredDimension(width, (lineHeight * shown.size).toInt() + pad) + } + + override fun onDraw(canvas: Canvas) { + val pad = paddingForShadow() + val radius = 3f * resources.displayMetrics.density + canvas.drawRoundRect(0f, 0f, width.toFloat(), height.toFloat(), radius, radius, backdrop) + shown.forEachIndexed { i, line -> + canvas.drawText(line, width - pad.toFloat(), pad - paint.ascent() + lineHeight * i, paint) + } + } + + override fun onTouchEvent(event: android.view.MotionEvent) = false + + private fun paddingForShadow() = (3 * resources.displayMetrics.density).toInt() + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt new file mode 100644 index 0000000000..db52954f3c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.audio + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class DirectAudioTimingTest { + @Test + fun lowLatencyOutputKeepsTheDriverDefaults() { + assertTrue(DirectAudioTiming.environment(lowLatencyOutput = true).isEmpty()) + } + + @Test + fun outputWithoutLowLatencyGetsALongerPeriodAndBuffer() { + assertEquals(listOf("AUDIO_DIRECT_PERIOD_MS=20", "AUDIO_DIRECT_MS=60"), DirectAudioTiming.environment(lowLatencyOutput = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt new file mode 100644 index 0000000000..35f2c8cf09 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BuildWatermarkTest { + @Test + fun stableAndPreviewBuildsHaveNoWatermark() { + assertNull(BuildWatermark.lines(pr = 0, ci = true, commit = "abcdef0123", title = "", branch = "")) + } + + @Test + fun prBuildShowsNumberHashAndTitle() { + assertEquals( + listOf("PR-1234 | abcdef0", "Fix: foo the bar"), + BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Fix: foo the bar", branch = "x"), + ) + } + + @Test + fun longTitlesTruncateAtEightyCharacters() { + val lines = BuildWatermark.lines(pr = 7, ci = true, commit = "abcdef0", title = "a".repeat(120), branch = "")!! + assertEquals(80, lines[1].length) + assertEquals('…', lines[1].last()) + } + + @Test + fun localBuildShowsBranch() { + assertEquals( + listOf("LOCAL | abcdef0", "feat/thing"), + BuildWatermark.lines(pr = 0, ci = false, commit = "abcdef0123", title = "", branch = "feat/thing"), + ) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 0d8fb50b34..8758346fb6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -736,6 +736,15 @@ def record_install_scripts(digest, env): print("droiddeck-game-env: install scripts not recorded (%s)" % error, file=sys.stderr) +def directaudio_settings(env): + if "directaudio" not in env.get("WINE_AUDIO_DRIVER", "").split(","): + return env + for name, value in list(env.items()): + if name.startswith("AUDIO_DIRECT_"): + env["BANNER_" + name] = value + return env + + def start(launch, launch_env, digest): launch, launch_env = system_graphics_launch(launch, launch_env) if digest: @@ -911,7 +920,8 @@ def main(): command = offline_without_anticheat(command, env) env = game_logs(command, env, app_id) if mic_enabled == "0": - env["BANNER_AUDIO_DIRECT_MIC"] = "0" + env["AUDIO_DIRECT_MIC"] = "0" + env = directaudio_settings(env) env = vram_cap(env) env = force_ssbs(command, env) game_cores(env) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 5d1cce1a87..53d1bb0f85 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -338,6 +338,11 @@ bl_directaudio() { fi WINEDLLPATH="$da/lib/wine${WINEDLLPATH:+:$WINEDLLPATH}" export WINEDLLPATH + for name in $(compgen -e); do + case $name in + AUDIO_DIRECT_*) export "BANNER_$name=${!name}" ;; + esac + done WINE_AUDIO_DRIVER="directaudio,pulse" export WINE_AUDIO_DRIVER pfx="${STEAM_COMPAT_DATA_PATH:-}/pfx" diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index f490f1f972..2a94874f33 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -326,23 +326,43 @@ class GameEnvironmentTest(unittest.TestCase): 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.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('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, + "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") + 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_game_profile_directaudio_settings_reach_the_driver(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + probe = home / "probe" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(' '.join(sorted(k + '=' + v for k, v in os.environ.items() if k.startswith('BANNER_AUDIO_DIRECT_'))))\n") + probe.chmod(0o755) + config = home / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + config.write_text(json.dumps({"version": 1, "games": {"42": {"AUDIO_DIRECT_MS": "80"}}})) + base = {key: value for key, value in os.environ.items() if "AUDIO_DIRECT_" not in key} + base.update(HOME=tmp, BL_MIC_ENABLED="0", STEAM_COMPAT_DATA_PATH="/compatdata/42", + AUDIO_DIRECT_MS="60", AUDIO_DIRECT_PERIOD_MS="20", AUDIO_DIRECT_MIC="1", + BANNER_AUDIO_DIRECT_MS="60", BANNER_AUDIO_DIRECT_MIC="1") + for driver, expected in (("directaudio,pulse", "BANNER_AUDIO_DIRECT_MIC=0 BANNER_AUDIO_DIRECT_MS=80 BANNER_AUDIO_DIRECT_PERIOD_MS=20"), + ("pulse", "BANNER_AUDIO_DIRECT_MIC=1 BANNER_AUDIO_DIRECT_MS=60")): + with self.subTest(driver=driver): + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], + env=dict(base, WINE_AUDIO_DRIVER=driver), text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), expected) + def test_desktop_games_restart_on_the_gpu_with_steams_preloads_handed_back(self): with tempfile.TemporaryDirectory() as tmp: home = Path(tmp) @@ -1712,11 +1732,11 @@ class DirectAudioPrefixTest(unittest.TestCase): (self.windows / folder).mkdir(parents=True) self.reg = self.compat / "pfx/user.reg" - def run_setup(self, verb="waitforexitandrun", target="game.exe", cwd=None): - script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1" "$3"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\n' + def run_setup(self, verb="waitforexitandrun", target="game.exe", cwd=None, extra=None): + script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1" "$3"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\nenv | grep "^BANNER_AUDIO_DIRECT_" | sort\n' steam = self.compat.parent / "Steam" env = dict(os.environ, BL_DIRECTAUDIO=str(self.sets), STEAM_COMPAT_DATA_PATH=str(self.compat), - STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam)) + STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam), **(extra or {})) env.pop("WINEDLLPATH", None) env.pop("WINE_AUDIO_DRIVER", None) return subprocess.run(["bash", "-c", script, "bash", str(self.tool), verb, target], cwd=cwd, env=env, @@ -1764,6 +1784,21 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIn("DirectAudio selected", result.stderr) self.assertEqual(self.link("system32"), str(self.audio / "lib/wine/aarch64-windows/winedirectaudio.drv")) self.assertEqual(self.audio_values(), [("[Software\\\\Wine\\\\Drivers]", '"Audio"="directaudio,pulse"')]) + def test_audio_direct_settings_reach_the_driver_under_its_own_names(self): + self.reg.write_text("WINE REGISTRY Version 2\n\n#arch=win64\n") + result = self.run_setup(extra={"AUDIO_DIRECT_MS": "60", "AUDIO_DIRECT_PERIOD_MS": "20", + "AUDIO_DIRECT_RELAY": "/run/relay.sock", "OTHER_AUDIO_DIRECT_MS": "5"}) + lines = [line for line in result.stdout.splitlines() if line.startswith("BANNER_")] + self.assertEqual(lines, ["BANNER_AUDIO_DIRECT_MS=60", "BANNER_AUDIO_DIRECT_PERIOD_MS=20", + "BANNER_AUDIO_DIRECT_RELAY=/run/relay.sock"]) + + def test_audio_direct_settings_are_not_handed_on_when_directaudio_stays_off(self): + legacycompat = self.compat.parent / "Steam/legacycompat" + legacycompat.mkdir(parents=True) + (legacycompat / "iscriptevaluator.exe").write_bytes(b"Steam install-script evaluator") + result = self.run_setup(target="iscriptevaluator.exe", cwd=legacycompat, extra={"AUDIO_DIRECT_MS": "60"}) + self.assertNotIn("BANNER_AUDIO_DIRECT_MS", result.stdout) + def test_non_launch_verbs_preserve_audio_configuration(self): for verb in ("getcompatpath", "getnativepath", "destroyprefix"): with self.subTest(verb=verb):