sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Bind to clock instead of music controller

Browse Source
This commit is contained in:
ansel
2022-12-22 15:35:53 +03:00
parent a18ece8610
commit f2e8776529
2 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Screens/Edit/Timing/TapTimingControl.cs
View File

@ -3,13 +3,13 @@
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
@ -30,8 +30,7 @@ namespace osu.Game.Screens.Edit.Timing
[Resolved]
private Bindable<ControlPointGroup> selectedGroup { get; set; } = null!;
[Resolved]
private MusicController musicController { get; set; } = null!;
private readonly IBindable<Track> track = new Bindable<Track>();
private readonly BindableBool isHandlingTapping = new BindableBool();
@ -39,7 +38,7 @@ namespace osu.Game.Screens.Edit.Timing
private Container<WaveformComparisonDisplay> waveformContainer = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuColour colours)
private void load(OverlayColourProvider colourProvider, OsuColour colours, EditorClock clock)
{
const float padding = 10;
@ -189,12 +188,8 @@ namespace osu.Game.Screens.Edit.Timing
start();
}, true);
musicController.TrackChanged += onTrackReload;
}
private void onTrackReload(WorkingBeatmap beatmap, TrackChangeDirection tcd)
{
waveformContainer.Child = new WaveformComparisonDisplay();
track.BindTo(clock.Track);
track.ValueChanged += _ => waveformContainer.Child = new WaveformComparisonDisplay();
}
private void start()
@ -249,12 +244,6 @@ namespace osu.Game.Screens.Edit.Timing
timing.BeatLength = 60000 / (timing.BPM + adjust);
}
protected override void Dispose(bool isDisposing)
{
musicController.TrackChanged -= onTrackReload;
base.Dispose(isDisposing);
}
private partial class InlineButton : OsuButton
{
private readonly IconUsage icon;