Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude protected beatmaps from consideration in several places #28890

Merged
merged 3 commits into from
Jul 17, 2024
Merged

Exclude protected beatmaps from consideration in several places #28890

merged 3 commits into from
Jul 17, 2024

Conversation

bdach
Copy link
Collaborator

@bdach bdach commented Jul 17, 2024

RFC.

In particular:

  • Song select will not permit Beatmap.Value to switch to a protected beatmap (will roll back to old value instead). This is mostly a safety rather than a proper fix.
  • Protected beatmaps are not shown in now playing overlay (thus they can't be navigated to, preventing the breakage)
  • Protected beatmaps are not considered by music controller when using previous/next buttons (knock-on fix of undesirable effects of the other changes)

@bdach
Do not allow working beatmap to switch to protected beatmap in song s…
4c1f902 
…elect

Principal fix to ppy#28880.
@bdach
Do not show protected beatmaps in playlist overlay
1ffc34b 
Secondary fix to ppy#28880.
@bdach
Add flags allowing excluding protected beatmaps from consideration in…
e4ff6b5 
… music controller

This means that the protected beatmap can not be skipped forward/back
to.

Incidentally closes ppy#23199.
@peppy peppy self-requested a review July 17, 2024 10:52
peppy
peppy approved these changes Jul 17, 2024
View reviewed changes
Copy link
Sponsor Member

@peppy peppy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine i think

osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -102,7 +102,7 @@ protected override void LoadComplete()
{
base.LoadComplete();

beatmapSubscription = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>().Where(s => !s.DeletePending), beatmapsChanged);
beatmapSubscription = realm.RegisterForNotifications(r => r.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected), beatmapsChanged);
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was originally an intentional design choice to show protected tracks here so users could play them, but I'm okay with changing this for now (at least until the protected beatmaps have playable .osu files attached.

@peppy peppy merged commit 84a36a4 into ppy:master Jul 17, 2024
8 of 17 checks passed
@bdach bdach deleted the protected-beatmaps-begone branch July 17, 2024 13:42
@Gabixel Gabixel mentioned this pull request Jul 17, 2024
Open
1 task
@bdach bdach mentioned this pull request Jul 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peppy peppy peppy approved these changes

Assignees
No one assigned
Labels
area:overlay-now-playing audio size/M
Projects
None yet
Milestone
No milestone
2 participants
@bdach @peppy