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

Introduce PreviewTrack class

Browse Source
This commit is contained in:
Roman Kapustin
2018-05-25 00:37:53 +03:00
parent d6076eb591
commit 498244a308
5 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -3,7 +3,6 @@
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -19,7 +18,7 @@ namespace osu.Game.Overlays.Direct
public class PlayButton : Container
{
public readonly Bindable<bool> Playing = new Bindable<bool>();
public Track Preview { get; private set; }
public PreviewTrack Preview { get; private set; }
private BeatmapSetInfo beatmapSet;
@ -32,6 +31,8 @@ namespace osu.Game.Overlays.Direct
beatmapSet = value;
Playing.Value = false;
if (Preview != null)
Preview.Stopped -= preview_Stopped;
Preview = null;
}
}
@ -85,12 +86,6 @@ namespace osu.Game.Overlays.Direct
{
hoverColour = colour.Yellow;
this.previewTrackManager = previewTrackManager;
previewTrackManager.PlaybackStopped += () =>
{
if (Preview == previewTrackManager.CurrentTrack)
Playing.Value = false;
};
}
protected override bool OnClick(InputState state)
@ -134,21 +129,24 @@ namespace osu.Game.Overlays.Direct
})
.ContinueWith(t =>
{
Preview.Stopped += preview_Stopped;
playingStateChanged(true);
loading = false;
});
return;
}
previewTrackManager.Play(Preview);
Preview.Start();
}
else
{
previewTrackManager.Stop();
Preview.Stop();
loading = false;
}
}
private void preview_Stopped() => Playing.Value = false;
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);