From fef69cea04049e376a0e29973fb9189cc859aca0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Jan 2018 18:11:38 +0900
Subject: [PATCH] Revert "Add volume ducking"

This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.
---
 osu.Game/Configuration/OsuConfigManager.cs     |  3 ---
 osu.Game/OsuGame.cs                            | 18 ------------------
 .../Settings/Sections/Audio/VolumeSettings.cs  |  4 +---
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c33dd91330..33810c9712 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Configuration
             };
 
             // Audio
-            Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
-
             Set(OsuSetting.MenuVoice, true);
             Set(OsuSetting.MenuMusic, true);
 
@@ -103,7 +101,6 @@ namespace osu.Game.Configuration
         MouseDisableButtons,
         MouseDisableWheel,
         AudioOffset,
-        VolumeInactive,
         MenuMusic,
         MenuVoice,
         CursorRotation,
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fbbc14dd5e..bd71d37f97 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -19,7 +19,6 @@ using OpenTK;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using osu.Framework.Audio;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
@@ -122,8 +121,6 @@ namespace osu.Game
             configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
             Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
             Ruleset.ValueChanged += r => configRuleset.Value = r.ID ?? 0;
-
-            LocalConfig.BindWith(OsuSetting.VolumeInactive, inactiveDuckVolume);
         }
 
         private ScheduledDelegate scoreLoad;
@@ -401,21 +398,6 @@ namespace osu.Game
             return false;
         }
 
-        private readonly BindableDouble inactiveDuckVolume = new BindableDouble();
-
-        protected override void OnDeactivated()
-        {
-            base.OnDeactivated();
-            Audio.AddAdjustment(AdjustableProperty.Volume, inactiveDuckVolume);
-        }
-
-        protected override void OnActivated()
-        {
-            base.OnActivated();
-            Audio.RemoveAdjustment(AdjustableProperty.Volume, inactiveDuckVolume);
-
-        }
-
         public bool OnReleased(GlobalAction action) => false;
 
         private Container mainContent;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
index 92ee01dd7a..40b9ff069b 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Settings.Sections.Audio
 {
@@ -13,12 +12,11 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
         protected override string Header => "Volume";
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuConfigManager config)
+        private void load(AudioManager audio)
         {
             Children = new Drawable[]
             {
                 new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.1f },
-                new SettingsSlider<double> { LabelText = "Master (Window Inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.1f },
                 new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.1f },
                 new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.1f },
             };