From 4a3f4c3a55ac513b85d1d1434b4ac145e3e53e78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Aug 2024 14:46:36 +0900
Subject: [PATCH] Don't duck music when effect volume is set to zero

Addresses https://github.com/ppy/osu/discussions/28984.
---
 osu.Game/Overlays/MusicController.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index d9bb92b4b7..27c7cd0f49 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Overlays
         [Resolved]
         private RealmAccess realm { get; set; } = null!;
 
+        private BindableNumber<double> sampleVolume = null!;
+
         private readonly BindableDouble audioDuckVolume = new BindableDouble(1);
 
         private AudioFilter audioDuckFilter = null!;
@@ -69,6 +71,7 @@ namespace osu.Game.Overlays
         {
             AddInternal(audioDuckFilter = new AudioFilter(audio.TrackMixer));
             audio.Tracks.AddAdjustment(AdjustableProperty.Volume, audioDuckVolume);
+            sampleVolume = audio.VolumeSample.GetBoundCopy();
         }
 
         protected override void LoadComplete()
@@ -269,6 +272,10 @@ namespace osu.Game.Overlays
         /// <returns>A <see cref="IDisposable"/> which will restore the duck operation when disposed.</returns>
         public IDisposable Duck(DuckParameters? parameters = null)
         {
+            // Don't duck if samples have no volume, it sounds weird.
+            if (sampleVolume.Value == 0)
+                return new InvokeOnDisposal(() => { });
+
             parameters ??= new DuckParameters();
 
             duckOperations.Add(parameters);
@@ -302,6 +309,10 @@ namespace osu.Game.Overlays
         /// <param name="parameters">Parameters defining the ducking operation.</param>
         public void DuckMomentarily(double delayUntilRestore, DuckParameters? parameters = null)
         {
+            // Don't duck if samples have no volume, it sounds weird.
+            if (sampleVolume.Value == 0)
+                return;
+
             parameters ??= new DuckParameters();
 
             IDisposable duckOperation = Duck(parameters);