h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

Rename AllowTrackAdjustments to more understandable ApplyModTrackAdjustments

Browse Source
This commit is contained in:
Dean Herbert 2023-07-25 19:58:23 +09:00
parent 060ad36d60
commit 157b1f301b
10 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs
View File

@ -56,38 +56,38 @@ namespace osu.Game.Tests.Visual
public void AllowTrackAdjustmentsTest() public void AllowTrackAdjustmentsTest()
{ {
AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>())); AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>()));
AddAssert("allows adjustments 1", () => musicController.AllowTrackAdjustments); AddAssert("allows adjustments 1", () => musicController.ApplyModTrackAdjustments);
AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>())); AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
AddAssert("allows adjustments 2", () => musicController.AllowTrackAdjustments); AddAssert("allows adjustments 2", () => musicController.ApplyModTrackAdjustments);
AddStep("push disallowing screen", () => stack.Push(loadNewScreen<DisallowScreen>())); AddStep("push disallowing screen", () => stack.Push(loadNewScreen<DisallowScreen>()));
AddAssert("disallows adjustments 3", () => !musicController.AllowTrackAdjustments); AddAssert("disallows adjustments 3", () => !musicController.ApplyModTrackAdjustments);
AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>())); AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
AddAssert("disallows adjustments 4", () => !musicController.AllowTrackAdjustments); AddAssert("disallows adjustments 4", () => !musicController.ApplyModTrackAdjustments);
AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>())); AddStep("push inheriting screen", () => stack.Push(loadNewScreen<InheritScreen>()));
AddAssert("disallows adjustments 5", () => !musicController.AllowTrackAdjustments); AddAssert("disallows adjustments 5", () => !musicController.ApplyModTrackAdjustments);
AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>())); AddStep("push allowing screen", () => stack.Push(loadNewScreen<AllowScreen>()));
AddAssert("allows adjustments 6", () => musicController.AllowTrackAdjustments); AddAssert("allows adjustments 6", () => musicController.ApplyModTrackAdjustments);
// Now start exiting from screens // Now start exiting from screens
AddStep("exit screen", () => stack.Exit()); AddStep("exit screen", () => stack.Exit());
AddAssert("disallows adjustments 7", () => !musicController.AllowTrackAdjustments); AddAssert("disallows adjustments 7", () => !musicController.ApplyModTrackAdjustments);
AddStep("exit screen", () => stack.Exit()); AddStep("exit screen", () => stack.Exit());
AddAssert("disallows adjustments 8", () => !musicController.AllowTrackAdjustments); AddAssert("disallows adjustments 8", () => !musicController.ApplyModTrackAdjustments);
AddStep("exit screen", () => stack.Exit()); AddStep("exit screen", () => stack.Exit());
AddAssert("disallows adjustments 9", () => !musicController.AllowTrackAdjustments); AddAssert("disallows adjustments 9", () => !musicController.ApplyModTrackAdjustments);
AddStep("exit screen", () => stack.Exit()); AddStep("exit screen", () => stack.Exit());
AddAssert("allows adjustments 10", () => musicController.AllowTrackAdjustments); AddAssert("allows adjustments 10", () => musicController.ApplyModTrackAdjustments);
AddStep("exit screen", () => stack.Exit()); AddStep("exit screen", () => stack.Exit());
AddAssert("allows adjustments 11", () => musicController.AllowTrackAdjustments); AddAssert("allows adjustments 11", () => musicController.ApplyModTrackAdjustments);
} }
public partial class TestScreen : ScreenWithBeatmapBackground public partial class TestScreen : ScreenWithBeatmapBackground
@ -129,12 +129,12 @@ namespace osu.Game.Tests.Visual
private partial class AllowScreen : OsuScreen private partial class AllowScreen : OsuScreen
{ {
public override bool? AllowTrackAdjustments => true; public override bool? ApplyModTrackAdjustments => true;
} }
public partial class DisallowScreen : OsuScreen public partial class DisallowScreen : OsuScreen
{ {
public override bool? AllowTrackAdjustments => false; public override bool? ApplyModTrackAdjustments => false;
} }
private partial class InheritScreen : OsuScreen private partial class InheritScreen : OsuScreen

2
osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
View File

@ -104,7 +104,7 @@ namespace osu.Game.Overlays.FirstRunSetup
{ {
protected override bool ControlGlobalMusic => false; protected override bool ControlGlobalMusic => false;
public override bool? AllowTrackAdjustments => false; public override bool? ApplyModTrackAdjustments => false;
} }
private partial class UIScaleSlider : RoundedSliderBar<float> private partial class UIScaleSlider : RoundedSliderBar<float>

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

@ -356,20 +356,20 @@ namespace osu.Game.Overlays
NextTrack(); NextTrack();
} }
private bool allowTrackAdjustments; private bool applyModTrackAdjustments;
/// <summary> /// <summary>
/// Whether mod track adjustments are allowed to be applied. /// Whether mod track adjustments are allowed to be applied.
/// </summary> /// </summary>
public bool AllowTrackAdjustments public bool ApplyModTrackAdjustments
{ {
get => allowTrackAdjustments; get => applyModTrackAdjustments;
set set
{ {
if (allowTrackAdjustments == value) if (applyModTrackAdjustments == value)
return; return;
allowTrackAdjustments = value; applyModTrackAdjustments = value;
ResetTrackAdjustments(); ResetTrackAdjustments();
} }
} }
@ -377,7 +377,7 @@ namespace osu.Game.Overlays
private AudioAdjustments modTrackAdjustments; private AudioAdjustments modTrackAdjustments;
/// <summary> /// <summary>
/// Resets the adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="AllowTrackAdjustments"/> is <c>true</c>. /// Resets the adjustments currently applied on <see cref="CurrentTrack"/> and applies the mod adjustments if <see cref="ApplyModTrackAdjustments"/> is <c>true</c>.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Does not reset any adjustments applied directly to the beatmap track. /// Does not reset any adjustments applied directly to the beatmap track.
@ -390,7 +390,7 @@ namespace osu.Game.Overlays
CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Tempo); CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Tempo);
CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Volume); CurrentTrack.RemoveAllAdjustments(AdjustableProperty.Volume);
if (allowTrackAdjustments) if (applyModTrackAdjustments)
{ {
CurrentTrack.BindAdjustments(modTrackAdjustments = new AudioAdjustments()); CurrentTrack.BindAdjustments(modTrackAdjustments = new AudioAdjustments());

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Screens.Edit
public override bool DisallowExternalBeatmapRulesetChanges => true; public override bool DisallowExternalBeatmapRulesetChanges => true;
public override bool? AllowTrackAdjustments => false; public override bool? ApplyModTrackAdjustments => false;
protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty; protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;

2
osu.Game/Screens/IOsuScreen.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Screens
/// Whether mod track adjustments should be applied on entering this screen. /// Whether mod track adjustments should be applied on entering this screen.
/// A <see langword="null"/> value means that the parent screen's value of this setting will be used. /// A <see langword="null"/> value means that the parent screen's value of this setting will be used.
/// </summary> /// </summary>
bool? AllowTrackAdjustments { get; } bool? ApplyModTrackAdjustments { get; }
/// <summary> /// <summary>
/// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>. /// Invoked when the back button has been pressed to close any overlays before exiting this <see cref="IOsuScreen"/>.

2
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
[Cached(typeof(IBindable<PlaylistItem>))] [Cached(typeof(IBindable<PlaylistItem>))]
public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>(); public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
public override bool? AllowTrackAdjustments => true; public override bool? ApplyModTrackAdjustments => true;
protected override BackgroundScreen CreateBackground() => new RoomBackgroundScreen(Room.Playlist.FirstOrDefault()) protected override BackgroundScreen CreateBackground() => new RoomBackgroundScreen(Room.Playlist.FirstOrDefault())
{ {

2
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
public override bool DisallowExternalBeatmapRulesetChanges => true; public override bool DisallowExternalBeatmapRulesetChanges => true;
// We are managing our own adjustments. For now, this happens inside the Player instances themselves. // We are managing our own adjustments. For now, this happens inside the Player instances themselves.
public override bool? AllowTrackAdjustments => false; public override bool? ApplyModTrackAdjustments => false;
/// <summary> /// <summary>
/// Whether all spectating players have finished loading. /// Whether all spectating players have finished loading.

14
osu.Game/Screens/OsuScreen.cs
View File

@ -85,7 +85,7 @@ namespace osu.Game.Screens
[Resolved] [Resolved]
private MusicController musicController { get; set; } private MusicController musicController { get; set; }
public virtual bool? AllowTrackAdjustments => null; public virtual bool? ApplyModTrackAdjustments => null;
public Bindable<WorkingBeatmap> Beatmap { get; private set; } public Bindable<WorkingBeatmap> Beatmap { get; private set; }
@ -95,7 +95,7 @@ namespace osu.Game.Screens
private OsuScreenDependencies screenDependencies; private OsuScreenDependencies screenDependencies;
private bool? trackAdjustmentStateAtSuspend; private bool? modTrackAdjustmentStateAtSuspend;
internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies); internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies);
@ -178,8 +178,8 @@ namespace osu.Game.Screens
// it's feasible to resume to a screen if the target screen never loaded successfully. // it's feasible to resume to a screen if the target screen never loaded successfully.
// in such a case there's no need to restore this value. // in such a case there's no need to restore this value.
if (trackAdjustmentStateAtSuspend != null) if (modTrackAdjustmentStateAtSuspend != null)
musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value; musicController.ApplyModTrackAdjustments = modTrackAdjustmentStateAtSuspend.Value;
base.OnResuming(e); base.OnResuming(e);
} }
@ -188,7 +188,7 @@ namespace osu.Game.Screens
{ {
base.OnSuspending(e); base.OnSuspending(e);
trackAdjustmentStateAtSuspend = musicController.AllowTrackAdjustments; modTrackAdjustmentStateAtSuspend = musicController.ApplyModTrackAdjustments;
onSuspendingLogo(); onSuspendingLogo();
} }
@ -197,8 +197,8 @@ namespace osu.Game.Screens
{ {
applyArrivingDefaults(false); applyArrivingDefaults(false);
if (AllowTrackAdjustments != null) if (ApplyModTrackAdjustments != null)
musicController.AllowTrackAdjustments = AllowTrackAdjustments.Value; musicController.ApplyModTrackAdjustments = ApplyModTrackAdjustments.Value;
if (backgroundStack?.Push(ownedBackground = CreateBackground()) != true) if (backgroundStack?.Push(ownedBackground = CreateBackground()) != true)
{ {

2
osu.Game/Screens/Play/Player.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered; protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
// We are managing our own adjustments (see OnEntering/OnExiting). // We are managing our own adjustments (see OnEntering/OnExiting).
public override bool? AllowTrackAdjustments => false; public override bool? ApplyModTrackAdjustments => false;
private readonly IBindable<bool> gameActive = new Bindable<bool>(true); private readonly IBindable<bool> gameActive = new Bindable<bool>(true);

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Screens.Select
protected virtual bool ShowFooter => true; protected virtual bool ShowFooter => true;
public override bool? AllowTrackAdjustments => true; public override bool? ApplyModTrackAdjustments => true;
/// <summary> /// <summary>
/// Can be null if <see cref="ShowFooter"/> is false. /// Can be null if <see cref="ShowFooter"/> is false.