Merge pull request #369 from peppy/general-fixes

General fixes.

osu-framework

@@ -1 +1 @@
-Subproject commit b62e49ecb06c4a5b6fb304568e03b0689a8bdac3
+Subproject commit 28c4acbb818d7be0ff66c600daacde9d91a99c6e

osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -53,7 +53,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             };
         }
 
-        private AudioSample sample;
+        private SampleChannel sample;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)

osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Modes.Osu.UI
 {
     public class OsuScoreOverlay : ScoreOverlay
     {
-        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter()
+        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
         {
             Anchor = Anchor.TopCentre,
             Origin = Anchor.TopCentre,

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -83,9 +83,9 @@ namespace osu.Game.Beatmaps
         }
 
         private ArchiveReader trackReader;
-        private AudioTrack track;
+        private Track track;
         private object trackLock = new object();
-        public AudioTrack Track
+        public Track Track
         {
             get
             {
@@ -99,7 +99,7 @@ namespace osu.Game.Beatmaps
                         trackReader = getReader();
                         var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
                         if (trackData != null)
-                            track = new AudioTrackBass(trackData);
+                            track = new TrackBass(trackData);
                     }
                     catch { }
 

osu.Game/Graphics/UserInterface/OsuCheckbox.cs

@@ -71,8 +71,8 @@ namespace osu.Game.Graphics.UserInterface
 
         private Nub nub;
         private SpriteText labelSpriteText;
-        private AudioSample sampleChecked;
+        private SampleChannel sampleChecked;
-        private AudioSample sampleUnchecked;
+        private SampleChannel sampleUnchecked;
 
         public OsuCheckbox()
         {

osu.Game/Graphics/UserInterface/OsuSliderBar.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuSliderBar<U> : SliderBar<U> where U : struct
     {
-        private AudioSample sample;
+        private SampleChannel sample;
         private double lastSampleTime;
 
         private Nub nub;

osu.Game/Graphics/UserInterface/PercentageCounter.cs

@@ -20,8 +20,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         protected override Type TransformType => typeof(TransformAccuracy);
 
-        protected override double RollingDuration => 150;
+        protected override double RollingDuration => 750;
-        protected override bool IsRollingProportional => true;
 
         private float epsilon => 1e-10f;
 
@@ -32,6 +31,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public PercentageCounter()
         {
+            DisplayedCountSpriteText.FixedWidth = true;
             Count = 1.0f;
         }
 

osu.Game/Graphics/UserInterface/RollingCounter.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// Easing for the counter rollover animation.
         /// </summary>
-        protected virtual EasingTypes RollingEasing => EasingTypes.Out;
+        protected virtual EasingTypes RollingEasing => EasingTypes.OutQuint;
 
         private T displayedCount;
 
@@ -117,10 +117,6 @@ namespace osu.Game.Graphics.UserInterface
             AutoSizeAxes = Axes.Both;
 
             DisplayedCount = Count;
-
-            DisplayedCountSpriteText.Text = FormatCount(count);
-            DisplayedCountSpriteText.Anchor = Anchor;
-            DisplayedCountSpriteText.Origin = Origin;
         }
 
         protected override void LoadComplete()
@@ -128,6 +124,10 @@ namespace osu.Game.Graphics.UserInterface
             base.LoadComplete();
 
             Flush(false, TransformType);
+
+            DisplayedCountSpriteText.Text = FormatCount(count);
+            DisplayedCountSpriteText.Anchor = Anchor;
+            DisplayedCountSpriteText.Origin = Origin;
         }
 
         /// <summary>

osu.Game/Graphics/UserInterface/TwoLayerButton.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50);
         public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50);
-        public AudioSample ActivationSound;
+        public SampleChannel ActivationSound;
         private SpriteText text;
 
         public Color4 HoverColour;

osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs

@@ -54,7 +54,7 @@ namespace osu.Game.Modes.Objects.Drawables
             }
         }
 
-        AudioSample sample;
+        SampleChannel sample;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)

osu.Game/Overlays/Pause/PauseButton.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.Pause
             }
         }
 
-        public AudioSample SampleClick, SampleHover;
+        public SampleChannel SampleClick, SampleHover;
 
         private Container backgroundContainer, colourContainer, glowContainer;
         private Box leftGlow, centerGlow, rightGlow;

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Toolbar
         private SpriteText tooltip1;
         private SpriteText tooltip2;
         protected FlowContainer Flow;
-        private AudioSample sampleClick;
+        private SampleChannel sampleClick;
 
         public ToolbarButton()
         {

osu.Game/Screens/Menu/Button.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Menu
         private readonly float extraWidth;
         private Key triggerKey;
         private string text;
-        private AudioSample sampleClick;
+        private SampleChannel sampleClick;
 
         public override bool Contains(Vector2 screenSpacePos)
         {

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Menu
         public Action OnChart;
         public Action OnTest;
 
-        private AudioSample sampleOsuClick;
+        private SampleChannel sampleOsuClick;
 
         private Toolbar toolbar;
 

osu.Game/Screens/Menu/Intro.cs

@@ -24,9 +24,9 @@ namespace osu.Game.Screens.Menu
         internal bool DidLoadMenu;
 
         MainMenu mainMenu;
-        private AudioSample welcome;
+        private SampleChannel welcome;
-        private AudioSample seeya;
+        private SampleChannel seeya;
-        private AudioTrack bgm;
+        private Track bgm;
 
         internal override bool ShowOverlays => false;
 

osu.Game/Screens/Menu/OsuLogo.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Menu
         private Container logoBounceContainer;
         private Container logoHoverContainer;
 
-        private AudioSample sampleClick;
+        private SampleChannel sampleClick;
 
         private Container colourAndTriangles;
 

osu.Game/Screens/Play/Player.cs

@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            AudioTrack track = Beatmap.Track;
+            Track track = Beatmap.Track;
 
             if (track != null)
             {

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -47,8 +47,8 @@ namespace osu.Game.Screens.Select
         private static readonly Vector2 background_blur = new Vector2(20);
         private CancellationTokenSource initialAddSetsTask;
 
-        private AudioSample sampleChangeDifficulty;
+        private SampleChannel sampleChangeDifficulty;
-        private AudioSample sampleChangeBeatmap;
+        private SampleChannel sampleChangeBeatmap;
 
         private List<BeatmapGroup> beatmapGroups;
 
@@ -317,7 +317,7 @@ namespace osu.Game.Screens.Select
 
         private void ensurePlayingSelected(bool preview = false)
         {
-            AudioTrack track = Beatmap?.Track;
+            Track track = Beatmap?.Track;
 
             if (track != null)
             {