From d6fa51dc5cf355168babe725dd87224a39bd894d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Apr 2017 12:06:24 +0900
Subject: [PATCH 1/4] Update SliderBar to use OnUserChange method.

---
 .../Graphics/UserInterface/OsuSliderBar.cs    | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 91fb1c672a..38cf8dcef9 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -63,15 +63,6 @@ namespace osu.Game.Graphics.UserInterface
             rightBox.Colour = colours.Pink;
         }
 
-        private void playSample()
-        {
-            if (Clock == null || Clock.CurrentTime - lastSampleTime <= 50)
-                return;
-            lastSampleTime = Clock.CurrentTime;
-            sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
-            sample.Play();
-        }
-
         protected override bool OnHover(InputState state)
         {
             nub.Glowing = true;
@@ -84,11 +75,19 @@ namespace osu.Game.Graphics.UserInterface
             base.OnHoverLost(state);
         }
 
-        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        protected override void OnUserChange()
         {
-            if (args.Key == Key.Left || args.Key == Key.Right)
-                playSample();
-            return base.OnKeyDown(state, args);
+            base.OnUserChange();
+            playSample();
+        }
+
+        private void playSample()
+        {
+            if (Clock == null || Clock.CurrentTime - lastSampleTime <= 50)
+                return;
+            lastSampleTime = Clock.CurrentTime;
+            sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
+            sample.Play();
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -103,18 +102,6 @@ namespace osu.Game.Graphics.UserInterface
             return base.OnMouseUp(state, args);
         }
 
-        protected override bool OnClick(InputState state)
-        {
-            playSample();
-            return base.OnClick(state);
-        }
-
-        protected override bool OnDrag(InputState state)
-        {
-            playSample();
-            return base.OnDrag(state);
-        }
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();

From 2964c04c148b5c1fc39b469de5bdbcf76edd1b49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Apr 2017 12:06:56 +0900
Subject: [PATCH 2/4] Add special SliderBar sound behaviour when at extents.

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 38cf8dcef9..9781a507cc 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -87,6 +87,17 @@ namespace osu.Game.Graphics.UserInterface
                 return;
             lastSampleTime = Clock.CurrentTime;
             sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
+
+            switch (NormalizedValue)
+            {
+                case 0:
+                    sample.Frequency.Value -= 0.4f;
+                    break;
+                case 1:
+                    sample.Frequency.Value += 0.4f;
+                    break;
+            }
+
             sample.Play();
         }
 

From ec6267c5b2a97873cfc3f47d5343bb1ed66b66d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Apr 2017 19:41:11 +0900
Subject: [PATCH 3/4] switch -> if.

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 9781a507cc..7895ae0aa4 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -88,15 +88,10 @@ namespace osu.Game.Graphics.UserInterface
             lastSampleTime = Clock.CurrentTime;
             sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
 
-            switch (NormalizedValue)
-            {
-                case 0:
-                    sample.Frequency.Value -= 0.4f;
-                    break;
-                case 1:
-                    sample.Frequency.Value += 0.4f;
-                    break;
-            }
+            if (NormalizedValue == 0)
+                sample.Frequency.Value -= 0.4f;
+            else if (NormalizedValue == 1)
+                sample.Frequency.Value += 0.4f;
 
             sample.Play();
         }

From 5bf71aae9c96fef30a8615eecbb3143129c9803d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipooo@gmail.com>
Date: Wed, 12 Apr 2017 20:14:12 +0900
Subject: [PATCH 4/4] Remove unused using.

---
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 7895ae0aa4..180cb88707 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
-using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;