From b0db3b46bfd8d4dab22e35c68ba1377fddc6bb03 Mon Sep 17 00:00:00 2001 From: wusumac <736139669@qq.com> Date: Mon, 14 Sep 2026 21:18:25 +0800 Subject: [PATCH] fix(m76-c): keep stream playback off the dummy driver and free players on dispose --- runtime/presentation/audio_service.gd | 56 +++++++++++++++++---- runtime/tests/audio/audio_service_test.gd | 2 + runtime/tools/m60_full_cycle_playthrough.gd | 3 ++ 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/runtime/presentation/audio_service.gd b/runtime/presentation/audio_service.gd index b0f5d2b1..1ff6e0ce 100644 --- a/runtime/presentation/audio_service.gd +++ b/runtime/presentation/audio_service.gd @@ -28,6 +28,10 @@ var music_family := "" var music_switches := 0 var music_restarts := 0 var output_enabled := true +## Headless/Dummy runs keep the semantic journal but never open streams: the +## dummy driver does not advance mixing, which leaves stream playbacks alive at +## exit (strict runtime diagnostics). Real drivers always play. +var output_available := true var _music_players: Array[AudioStreamPlayer] = [] var _music_active := 0 @@ -36,13 +40,38 @@ var _sfx_next := 0 var _stream_cache: Dictionary = {} var _last_played_ms: Dictionary = {} var _music_fade_generation := 0 +var _fade_from := -1 +var _fade_to := -1 +var _fade_elapsed := 0.0 +var _fade_duration := 0.0 var _rng := RandomNumberGenerator.new() func _ready() -> void: _rng.randomize() + output_available = AudioServer.get_driver_name() != "Dummy" load_manifest() _build_players() + set_process(output_available) + + +func _process(delta: float) -> void: + if _fade_to < 0: + return + _fade_elapsed += delta + var t := clampf(_fade_elapsed / maxf(0.001, _fade_duration), 0.0, 1.0) + _music_players[_fade_to].volume_db = lerpf(-80.0, 0.0, t) + if _fade_from >= 0: + _music_players[_fade_from].volume_db = lerpf(0.0, -80.0, t) + if t >= 1.0: + if _fade_from >= 0 and _fade_from != _fade_to: + _music_players[_fade_from].stop() + _fade_from = -1 + _fade_to = -1 + + +func _exit_tree() -> void: + dispose() func load_manifest(path := MANIFEST_PATH) -> bool: @@ -90,6 +119,13 @@ func set_music(family: String) -> bool: if family == music_family: return false var entry: Dictionary = Dictionary(music_families[family]) + if not output_available: + music_family = family + music_switches += 1 + if music_switches > 1: + music_restarts += 1 + _record({"kind": "music", "name": family, "bus": String(entry.get("bus", "Music")), "priority": "P2", "suppressed": "" if output_enabled else "muted"}) + return true var stream := _stream_for(String(entry.get("file", "")), true) if stream == null: return false @@ -119,6 +155,9 @@ func play_sfx(event_name: String, transaction_id := "") -> bool: _record({"kind": "sfx", "name": event_name, "bus": String(entry.get("bus", "SFX")), "priority": priority, "suppressed": "cooldown"}) return false _last_played_ms[event_name] = now + if not output_available: + _record({"kind": "sfx", "name": event_name, "bus": String(entry.get("bus", "SFX")), "priority": priority, "suppressed": "", "transaction_id": transaction_id}) + return true var stream := _stream_for(String(entry.get("file", "")), false) if stream == null: _record({"kind": "sfx", "name": event_name, "bus": String(entry.get("bus", "SFX")), "priority": priority, "suppressed": "missing_asset"}) @@ -136,7 +175,11 @@ func dispose() -> void: stop_all() for player in _music_players + _sfx_players: player.stream = null + if is_instance_valid(player): + player.queue_free() _stream_cache.clear() + _music_players.clear() + _sfx_players.clear() func stop_all() -> void: @@ -220,12 +263,7 @@ func _crossfade_to(stream: AudioStream, bus: StringName) -> void: to.bus = bus to.volume_db = -80.0 to.play() - var tween := create_tween() - tween.set_parallel(true) - tween.tween_property(to, "volume_db", 0.0, crossfade_seconds) - if from.playing: - tween.tween_property(from, "volume_db", -80.0, crossfade_seconds) - tween.chain().tween_callback(func() -> void: - if generation == _music_fade_generation and from != to: - from.stop() - ) + _fade_from = _music_players.find(from) + _fade_to = _music_players.find(to) + _fade_elapsed = 0.0 + _fade_duration = crossfade_seconds diff --git a/runtime/tests/audio/audio_service_test.gd b/runtime/tests/audio/audio_service_test.gd index c3ce27de..4c9a7816 100644 --- a/runtime/tests/audio/audio_service_test.gd +++ b/runtime/tests/audio/audio_service_test.gd @@ -62,6 +62,8 @@ func _run() -> void: service.apply_settings({"master_muted": false, "music_volume": 0.8, "ambience_volume": 0.8, "sfx_volume": 0.9, "voice_volume": 0.8}) _expect(not AudioServer.is_bus_mute(master), "master mute is reversible") service.dispose() + await process_frame + await process_frame if failures.is_empty(): print("ABG_M76_AUDIO_SERVICE_OK events=%d families=%d buses=9 cooldown=ok priority=ok mute=ok" % [service.events.size(), service.music_families.size()]) diff --git a/runtime/tools/m60_full_cycle_playthrough.gd b/runtime/tools/m60_full_cycle_playthrough.gd index 3d0abb4d..53385bed 100644 --- a/runtime/tools/m60_full_cycle_playthrough.gd +++ b/runtime/tools/m60_full_cycle_playthrough.gd @@ -50,6 +50,9 @@ func _run() -> void: var game := MainScene.instantiate() game_node = game + # M65-I03 convention: the legacy tone adapter leaks its generator playback + # under the dummy driver; the driven cycle never needs audible tones. + game.audio_enabled = false root.add_child(game) await _frames(60) shell = game.entry_shell