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

"Update" MusicController

Browse Source
This commit is contained in:
Dean Herbert
2021-11-08 17:59:23 +09:00
parent c4a9211179
commit abd72c496b
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game/Overlays/MusicController.cs
View File

@ -12,10 +12,11 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Audio; using osu.Framework.Graphics.Audio;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Utils;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using Realms;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
@ -24,6 +25,8 @@ namespace osu.Game.Overlays
/// </summary> /// </summary>
public class MusicController : CompositeDrawable public class MusicController : CompositeDrawable
{ {
private IDisposable beatmapSubscription;
[Resolved] [Resolved]
private BeatmapManager beatmaps { get; set; } private BeatmapManager beatmaps { get; set; }
@ -65,13 +68,14 @@ namespace osu.Game.Overlays
[NotNull] [NotNull]
public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000)); public DrawableTrack CurrentTrack { get; private set; } = new DrawableTrack(new TrackVirtual(1000));
[BackgroundDependencyLoader] [Resolved]
private void load() private RealmContextFactory realmFactory { get; set; }
{
beatmaps.ItemUpdated += beatmapUpdated;
beatmaps.ItemRemoved += beatmapRemoved;
beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(true).OrderBy(_ => RNG.Next())); protected override void LoadComplete()
{
base.LoadComplete();
beatmapSubscription = realmFactory.Context.All<BeatmapSetInfo>().QueryAsyncWithNotifications(beatmapsChanged);
// Todo: These binds really shouldn't be here, but are unlikely to cause any issues for now. // Todo: These binds really shouldn't be here, but are unlikely to cause any issues for now.
// They are placed here for now since some tests rely on setting the beatmap _and_ their hierarchies inside their load(), which runs before the MusicController's load(). // They are placed here for now since some tests rely on setting the beatmap _and_ their hierarchies inside their load(), which runs before the MusicController's load().
@ -79,6 +83,24 @@ namespace osu.Game.Overlays
mods.BindValueChanged(_ => ResetTrackAdjustments(), true); mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
} }
private void beatmapsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeSet changes, Exception error)
{
if (changes == null)
{
beatmapSets.AddRange(sender);
return;
}
// beatmaps.ItemUpdated += set => Schedule(() =>
// {
// beatmapSets.Remove(set);
// beatmapSets.Add(set);
// });
// beatmaps.ItemRemoved += set => Schedule(() => beatmapSets.RemoveAll(s => s.ID == set.ID));
//
// beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal, true).OrderBy(_ => RNG.Next()));
}
/// <summary> /// <summary>
/// Forcefully reload the current <see cref="WorkingBeatmap"/>'s track from disk. /// Forcefully reload the current <see cref="WorkingBeatmap"/>'s track from disk.
/// </summary> /// </summary>
@ -111,7 +133,7 @@ namespace osu.Game.Overlays
beatmapSets.Add(set); beatmapSets.Add(set);
}); });
private void beatmapRemoved(BeatmapSetInfo set) => Schedule(() => beatmapSets.RemoveAll(s => s.Equals(set))); private void beatmapRemoved(BeatmapSetInfo set) => Schedule(() => beatmapSets.RemoveAll(s => s.ID == set.ID));
private ScheduledDelegate seekDelegate; private ScheduledDelegate seekDelegate;
@ -259,7 +281,7 @@ namespace osu.Game.Overlays
queuedDirection = TrackChangeDirection.Next; queuedDirection = TrackChangeDirection.Next;
var playable = BeatmapSets.SkipWhile(i => !i.Equals(current.BeatmapSetInfo)).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault(); var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault();
if (playable != null) if (playable != null)
{ {
@ -429,11 +451,7 @@ namespace osu.Game.Overlays
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);
if (beatmaps != null) beatmapSubscription?.Dispose();
{
beatmaps.ItemUpdated -= beatmapUpdated;
beatmaps.ItemRemoved -= beatmapRemoved;
}
} }
} }