diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index ab519360ac..74ae641bfe 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -7,10 +7,16 @@ using System.Linq;
using System.Threading;
using NUnit.Framework;
using osu.Framework.Allocation;
+using osu.Framework.Audio;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
using osu.Framework.MathUtils;
using osu.Framework.Screens;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Scoring;
@@ -18,25 +24,49 @@ using osu.Game.Scoring;
using osu.Game.Screens;
using osu.Game.Screens.Play;
using osu.Game.Screens.Play.PlayerSettings;
+using osuTK.Input;
namespace osu.Game.Tests.Visual.Gameplay
{
public class TestScenePlayerLoader : ManualInputManagerTestScene
{
private TestPlayerLoader loader;
- private OsuScreenStack stack;
+ private TestPlayerLoaderContainer container;
+ private TestPlayer player;
- [SetUp]
- public void Setup() => Schedule(() =>
+ [Resolved]
+ private AudioManager audioManager { get; set; }
+
+ [Resolved]
+ private SessionStatics sessionStatics { get; set; }
+
+ /// <summary>
+ /// Sets the input manager child to a new test player loader container instance.
+ /// </summary>
+ /// <param name="interactive">If the test player should behave like the production one.</param>
+ /// <param name="beforeLoadAction">An action to run before player load but after bindable leases are returned.</param>
+ /// <param name="afterLoadAction">An action to run after container load.</param>
+ public void ResetPlayer(bool interactive, Action beforeLoadAction = null, Action afterLoadAction = null)
{
- InputManager.Child = stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
+ audioManager.Volume.SetDefault();
+
+ InputManager.Clear();
+
+ beforeLoadAction?.Invoke();
Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
- });
+
+ InputManager.Child = container = new TestPlayerLoaderContainer(
+ loader = new TestPlayerLoader(() =>
+ {
+ afterLoadAction?.Invoke();
+ return player = new TestPlayer(interactive, interactive);
+ }));
+ }
[Test]
public void TestBlockLoadViaMouseMovement()
{
- AddStep("load dummy beatmap", () => stack.Push(loader = new TestPlayerLoader(() => new TestPlayer(false, false))));
+ AddStep("load dummy beatmap", () => ResetPlayer(false));
AddUntilStep("wait for current", () => loader.IsCurrentScreen());
AddRepeatStep("move mouse", () => InputManager.MoveMouseTo(loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft + (loader.VisualSettings.ScreenSpaceDrawQuad.BottomRight - loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft) * RNG.NextSingle()), 20);
AddAssert("loader still active", () => loader.IsCurrentScreen());
@@ -46,16 +76,17 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestLoadContinuation()
{
- Player player = null;
SlowLoadPlayer slowPlayer = null;
- AddStep("load dummy beatmap", () => stack.Push(loader = new TestPlayerLoader(() => player = new TestPlayer(false, false))));
+ AddStep("load dummy beatmap", () => ResetPlayer(false));
AddUntilStep("wait for current", () => loader.IsCurrentScreen());
AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
AddUntilStep("wait for player to be current", () => player.IsCurrentScreen());
AddStep("load slow dummy beatmap", () =>
{
- stack.Push(loader = new TestPlayerLoader(() => slowPlayer = new SlowLoadPlayer(false, false)));
+ InputManager.Child = container = new TestPlayerLoaderContainer(
+ loader = new TestPlayerLoader(() => slowPlayer = new SlowLoadPlayer(false, false)));
+
Scheduler.AddDelayed(() => slowPlayer.AllowLoad.Set(), 5000);
});
@@ -65,16 +96,11 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestModReinstantiation()
{
- TestPlayer player = null;
TestMod gameMod = null;
TestMod playerMod1 = null;
TestMod playerMod2 = null;
- AddStep("load player", () =>
- {
- Mods.Value = new[] { gameMod = new TestMod() };
- stack.Push(loader = new TestPlayerLoader(() => player = new TestPlayer()));
- });
+ AddStep("load player", () => { ResetPlayer(true, () => Mods.Value = new[] { gameMod = new TestMod() }); });
AddUntilStep("wait for loader to become current", () => loader.IsCurrentScreen());
AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
@@ -97,6 +123,75 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("player mods applied", () => playerMod2.Applied);
}
+ [Test]
+ public void TestMutedNotificationMasterVolume() => addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
+
+ [Test]
+ public void TestMutedNotificationTrackVolume() => addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, null, () => audioManager.VolumeTrack.IsDefault);
+
+ [Test]
+ public void TestMutedNotificationMuteButton() => addVolumeSteps("mute button", null, () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+
+ /// <remarks>
+ /// Created for avoiding copy pasting code for the same steps.
+ /// </remarks>
+ /// <param name="volumeName">What part of the volume system is checked</param>
+ /// <param name="beforeLoad">The action to be invoked to set the volume before loading</param>
+ /// <param name="afterLoad">The action to be invoked to set the volume after loading</param>
+ /// <param name="assert">The function to be invoked and checked</param>
+ private void addVolumeSteps(string volumeName, Action beforeLoad, Action afterLoad, Func<bool> assert)
+ {
+ AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
+
+ AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad));
+ AddUntilStep("wait for player", () => player.IsLoaded);
+
+ AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);
+ AddStep("click notification", () =>
+ {
+ var scrollContainer = (OsuScrollContainer)container.NotificationOverlay.Children.Last();
+ var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+ var notification = flowContainer.First();
+
+ InputManager.MoveMouseTo(notification);
+ InputManager.Click(MouseButton.Left);
+ });
+
+ AddAssert("check " + volumeName, assert);
+ }
+
+ private class TestPlayerLoaderContainer : Container
+ {
+ [Cached]
+ public readonly NotificationOverlay NotificationOverlay;
+
+ [Cached]
+ public readonly VolumeOverlay VolumeOverlay;
+
+ public TestPlayerLoaderContainer(IScreen screen)
+ {
+ RelativeSizeAxes = Axes.Both;
+
+ InternalChildren = new Drawable[]
+ {
+ new OsuScreenStack(screen)
+ {
+ RelativeSizeAxes = Axes.Both,
+ },
+ NotificationOverlay = new NotificationOverlay
+ {
+ Anchor = Anchor.TopRight,
+ Origin = Anchor.TopRight,
+ },
+ VolumeOverlay = new VolumeOverlay
+ {
+ Anchor = Anchor.TopLeft,
+ Origin = Anchor.TopLeft,
+ }
+ };
+ }
+ }
+
private class TestPlayerLoader : PlayerLoader
{
public new VisualSettings VisualSettings => base.VisualSettings;
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 90c6c9065c..6bdd94db21 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -239,6 +239,18 @@ namespace osu.Game.Tests.Visual.SongSelect
AddAssert("Selection is non-null", () => currentSelection != null);
setSelected(1, 3);
+ }
+
+ [Test]
+ public void TestFilterRange()
+ {
+ loadBeatmaps();
+
+ // buffer the selection
+ setSelected(3, 2);
+
+ setSelected(1, 3);
+
AddStep("Apply a range filter", () => carousel.Filter(new FilterCriteria
{
SearchText = "#3",
@@ -249,9 +261,9 @@ namespace osu.Game.Tests.Visual.SongSelect
IsLowerInclusive = true
}
}, false));
- waitForSelection(3, 2);
- AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
+ // should reselect the buffered selection.
+ waitForSelection(3, 2);
}
/// <summary>
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 818a95c0be..40b2adb867 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -11,11 +11,13 @@ namespace osu.Game.Configuration
protected override void InitialiseDefaults()
{
Set(Static.LoginOverlayDisplayed, false);
+ Set(Static.MutedAudioNotificationShownOnce, false);
}
}
public enum Static
{
LoginOverlayDisplayed,
+ MutedAudioNotificationShownOnce
}
}
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 17d1bd822e..b567f0c0e3 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -400,20 +400,17 @@ namespace osu.Game.Database
int i = 0;
- using (ContextFactory.GetForWrite())
+ foreach (var b in items)
{
- foreach (var b in items)
- {
- if (notification.State == ProgressNotificationState.Cancelled)
- // user requested abort
- return;
+ if (notification.State == ProgressNotificationState.Cancelled)
+ // user requested abort
+ return;
- notification.Text = $"Deleting {HumanisedModelName}s ({++i} of {items.Count})";
+ notification.Text = $"Deleting {HumanisedModelName}s ({++i} of {items.Count})";
- Delete(b);
+ Delete(b);
- notification.Progress = (float)i / items.Count;
- }
+ notification.Progress = (float)i / items.Count;
}
notification.State = ProgressNotificationState.Completed;
@@ -439,20 +436,17 @@ namespace osu.Game.Database
int i = 0;
- using (ContextFactory.GetForWrite())
+ foreach (var item in items)
{
- foreach (var item in items)
- {
- if (notification.State == ProgressNotificationState.Cancelled)
- // user requested abort
- return;
+ if (notification.State == ProgressNotificationState.Cancelled)
+ // user requested abort
+ return;
- notification.Text = $"Restoring ({++i} of {items.Count})";
+ notification.Text = $"Restoring ({++i} of {items.Count})";
- Undelete(item);
+ Undelete(item);
- notification.Progress = (float)i / items.Count;
- }
+ notification.Progress = (float)i / items.Count;
}
notification.State = ProgressNotificationState.Completed;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3a7e53905c..5742d423bb 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -488,7 +488,8 @@ namespace osu.Game
toolbarElements.Add(d);
});
- loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add);
+ loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
+
loadComponentSingleFile(new OnScreenDisplay(), Add, true);
loadComponentSingleFile(musicController = new MusicController(), Add, true);
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 49d16a4f3e..f5c36a9cac 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays
/// <summary>
/// Returns whether the current beatmap track is playing.
/// </summary>
- public bool IsPlaying => beatmap.Value?.Track.IsRunning ?? false;
+ public bool IsPlaying => current?.Track.IsRunning ?? false;
private void handleBeatmapAdded(BeatmapSetInfo set) =>
Schedule(() => beatmapSets.Add(set));
diff --git a/osu.Game/Overlays/VolumeOverlay.cs b/osu.Game/Overlays/VolumeOverlay.cs
index e6204a3179..27e2eef200 100644
--- a/osu.Game/Overlays/VolumeOverlay.cs
+++ b/osu.Game/Overlays/VolumeOverlay.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Overlays
private readonly BindableDouble muteAdjustment = new BindableDouble();
+ private readonly Bindable<bool> isMuted = new Bindable<bool>();
+ public Bindable<bool> IsMuted => isMuted;
+
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
@@ -64,7 +67,8 @@ namespace osu.Game.Overlays
volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.BlueDarker),
muteButton = new MuteButton
{
- Margin = new MarginPadding { Top = 100 }
+ Margin = new MarginPadding { Top = 100 },
+ Current = { BindTarget = isMuted }
}
}
},
@@ -74,13 +78,13 @@ namespace osu.Game.Overlays
volumeMeterEffect.Bindable.BindTo(audio.VolumeSample);
volumeMeterMusic.Bindable.BindTo(audio.VolumeTrack);
- muteButton.Current.ValueChanged += muted =>
+ isMuted.BindValueChanged(muted =>
{
if (muted.NewValue)
audio.AddAdjustment(AdjustableProperty.Volume, muteAdjustment);
else
audio.RemoveAdjustment(AdjustableProperty.Volume, muteAdjustment);
- };
+ });
}
protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 5396321160..87d902b547 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@@ -14,11 +16,14 @@ using osu.Framework.Localisation;
using osu.Framework.Screens;
using osu.Framework.Threading;
using osu.Game.Beatmaps;
+using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Play.HUD;
@@ -53,9 +58,19 @@ namespace osu.Game.Screens.Play
private Task loadTask;
private InputManager inputManager;
-
private IdleTracker idleTracker;
+ [Resolved(CanBeNull = true)]
+ private NotificationOverlay notificationOverlay { get; set; }
+
+ [Resolved(CanBeNull = true)]
+ private VolumeOverlay volumeOverlay { get; set; }
+
+ [Resolved]
+ private AudioManager audioManager { get; set; }
+
+ private Bindable<bool> muteWarningShownOnce;
+
public PlayerLoader(Func<Player> createPlayer)
{
this.createPlayer = createPlayer;
@@ -68,8 +83,10 @@ namespace osu.Game.Screens.Play
}
[BackgroundDependencyLoader]
- private void load()
+ private void load(SessionStatics sessionStatics)
{
+ muteWarningShownOnce = sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce);
+
InternalChild = (content = new LogoTrackingContainer
{
Anchor = Anchor.Centre,
@@ -103,7 +120,22 @@ namespace osu.Game.Screens.Play
loadNewPlayer();
}
- private void playerLoaded(Player player) => info.Loading = false;
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ inputManager = GetContainingInputManager();
+
+ if (!muteWarningShownOnce.Value)
+ {
+ //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
+ if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
+ {
+ notificationOverlay?.Post(new MutedNotification());
+ muteWarningShownOnce.Value = true;
+ }
+ }
+ }
public override void OnResuming(IScreen last)
{
@@ -127,7 +159,7 @@ namespace osu.Game.Screens.Play
player.RestartCount = restartCount;
player.RestartRequested = restartRequested;
- loadTask = LoadComponentAsync(player, playerLoaded);
+ loadTask = LoadComponentAsync(player, _ => info.Loading = false);
}
private void contentIn()
@@ -185,12 +217,6 @@ namespace osu.Game.Screens.Play
content.StopTracking();
}
- protected override void LoadComplete()
- {
- inputManager = GetContainingInputManager();
- base.LoadComplete();
- }
-
private ScheduledDelegate pushDebounce;
protected VisualSettings VisualSettings;
@@ -473,5 +499,33 @@ namespace osu.Game.Screens.Play
Loading = true;
}
}
+
+ private class MutedNotification : SimpleNotification
+ {
+ public MutedNotification()
+ {
+ Text = "Your music volume is set to 0%! Click here to restore it.";
+ }
+
+ public override bool IsImportant => true;
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours, AudioManager audioManager, NotificationOverlay notificationOverlay, VolumeOverlay volumeOverlay)
+ {
+ Icon = FontAwesome.Solid.VolumeMute;
+ IconBackgound.Colour = colours.RedDark;
+
+ Activated = delegate
+ {
+ notificationOverlay.Hide();
+
+ volumeOverlay.IsMuted.Value = false;
+ audioManager.Volume.SetDefault();
+ audioManager.VolumeTrack.SetDefault();
+
+ return true;
+ };
+ }
+ }
}
}