diff --git a/osu.Android.props b/osu.Android.props
index 301c615ce4..3cd4dc48bf 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
-
+
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index c004b6db28..9b820261ab 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Input;
@@ -191,15 +190,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
Initial,
Body,
}
-
- private class Segment
- {
- public readonly List ControlPoints = new List();
-
- public Segment(Vector2 offset)
- {
- ControlPoints.Add(offset);
- }
- }
}
}
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index dcec17788a..9a0e112727 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Online
///
protected readonly Bindable State = new Bindable();
- protected readonly Bindable Progress = new Bindable();
+ protected readonly BindableNumber Progress = new BindableNumber { MinValue = 0, MaxValue = 1 };
protected DownloadTrackingComposite(TModel model = null)
{
diff --git a/osu.Game/Rulesets/Mods/ModTimeAdjust.cs b/osu.Game/Rulesets/Mods/ModTimeAdjust.cs
index f137a75ed8..7d0cc2a7c3 100644
--- a/osu.Game/Rulesets/Mods/ModTimeAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeAdjust.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
public virtual void ApplyToTrack(Track track)
{
- track.TempoAdjust *= RateAdjust;
+ track.Tempo.Value *= RateAdjust;
}
}
}
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 96275c1274..a856974292 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -511,15 +511,19 @@ namespace osu.Game.Rulesets.UI
public IEnumerable GetAvailableResources() => throw new NotImplementedException();
- public void AddAdjustment(AdjustableProperty type, BindableDouble adjustBindable) => throw new NotImplementedException();
+ public void AddAdjustment(AdjustableProperty type, BindableNumber adjustBindable) => throw new NotImplementedException();
- public void RemoveAdjustment(AdjustableProperty type, BindableDouble adjustBindable) => throw new NotImplementedException();
+ public void RemoveAdjustment(AdjustableProperty type, BindableNumber adjustBindable) => throw new NotImplementedException();
- public BindableDouble Volume => throw new NotImplementedException();
+ public BindableNumber Volume => throw new NotImplementedException();
- public BindableDouble Balance => throw new NotImplementedException();
+ public BindableNumber Balance => throw new NotImplementedException();
- public BindableDouble Frequency => throw new NotImplementedException();
+ public BindableNumber Frequency => throw new NotImplementedException();
+
+ public BindableNumber Tempo => throw new NotImplementedException();
+
+ public IBindable GetAggregate(AdjustableProperty type) => throw new NotImplementedException();
public IBindable AggregateVolume => throw new NotImplementedException();
@@ -527,6 +531,8 @@ namespace osu.Game.Rulesets.UI
public IBindable AggregateFrequency => throw new NotImplementedException();
+ public IBindable AggregateTempo => throw new NotImplementedException();
+
public int PlaybackConcurrency
{
get => throw new NotImplementedException();
diff --git a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
index 921a1d9789..ad24ffc7b8 100644
--- a/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
+++ b/osu.Game/Tests/Visual/RateAdjustedBeatmapTestScene.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Visual
base.Update();
// note that this will override any mod rate application
- Beatmap.Value.Track.TempoAdjust = Clock.Rate;
+ Beatmap.Value.Track.Tempo.Value = Clock.Rate;
}
}
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ef16738908..530d62f583 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 5090190f28..fb753b8c6f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
-
+
@@ -82,7 +82,7 @@
-
+