Merge branch 'master' into general-fixes

osu.Game/Configuration/OsuConfigManager.cs

@@ -38,6 +38,8 @@ protected override void InitialiseDefaults()
             Set(OsuConfig.KeyOverlay, false);
             //todo: implement all settings below this line (remove the Disabled set when doing so).
 
+            Set(OsuConfig.AudioOffset, 0, -500.0, 500.0);
+
             Set(OsuConfig.MouseSpeed, 1.0).Disabled = true;
             Set(OsuConfig.BeatmapDirectory, @"Songs").Disabled = true; // TODO: use thi.Disabled = trues
             Set(OsuConfig.AllowPublicInvites, true).Disabled = true;
@@ -103,7 +105,6 @@ protected override void InitialiseDefaults()
             Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
             Set(OsuConfig.MenuTip, 0).Disabled = true;
             Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
-            Set(OsuConfig.Offset, 0, -300, 300).Disabled = true;
             Set(OsuConfig.ScoreMeterScale, 1, 0.5, 2).Disabled = true;
             //Set(OsuConfig.ScoreMeterScale, 1, 0.5, OsuGame.Tournament ? 10 : 2).Disabled = true;
             Set(OsuConfig.DistanceSpacing, 0.8, 0.1, 6).Disabled = true;
@@ -270,7 +271,7 @@ public enum OsuConfig
         MouseDisableButtons,
         MouseDisableWheel,
         MouseSpeed,
-        Offset,
+        AudioOffset,
         ScoreMeterScale,
         DistanceSpacing,
         EditorBeatDivisor,

osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs

@@ -18,10 +18,10 @@ private void load(OsuConfigManager config)
         {
             Children = new Drawable[]
             {
-                new OptionSlider<int>
+                new OptionSlider<double>
                 {
-                    LabelText = "Universal Offset",
-                    Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.Offset)
+                    LabelText = "Audio Offset",
+                    Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.AudioOffset)
                 },
                 new OsuButton
                 {

osu.Game/Screens/Play/Player.cs

@@ -51,13 +51,22 @@ public class Player : OsuScreen
         private bool canPause => ValidForResume && !HasFailed && Time.Current >= lastPauseActionTime + pause_cooldown;
 
         private IAdjustableClock sourceClock;
+        private OffsetClock offsetClock;
         private IFrameBasedClock interpolatedSourceClock;
 
         private RulesetInfo ruleset;
 
         private ScoreProcessor scoreProcessor;
         protected HitRenderer HitRenderer;
+
+        #region User Settings
+
         private Bindable<int> dimLevel;
+        private Bindable<bool> mouseWheelDisabled;
+        private Bindable<double> userAudioOffset;
+
+        #endregion
+
         private SkipButton skipButton;
 
         private HudOverlay hudOverlay;
@@ -117,7 +126,13 @@ private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuConfigManager
             }
 
             sourceClock = (IAdjustableClock)track ?? new StopwatchClock();
-            interpolatedSourceClock = new InterpolatingFramedClock(sourceClock);
+            offsetClock = new OffsetClock(sourceClock);
+
+            userAudioOffset = config.GetBindable<double>(OsuConfig.AudioOffset);
+            userAudioOffset.ValueChanged += v => offsetClock.Offset = v;
+            userAudioOffset.TriggerChange();
+
+            interpolatedSourceClock = new InterpolatingFramedClock(offsetClock);
 
             Schedule(() =>
             {
@@ -362,8 +377,6 @@ private void fadeOut()
             Background?.FadeTo(1f, fade_out_duration);
         }
 
-        private Bindable<bool> mouseWheelDisabled;
-
         protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
     }
 }