sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Split polling logic from RoomManager, now a container

Browse Source
This commit is contained in:
smoogipoo
2019-02-05 15:38:19 +09:00
parent e33277bd76
commit 37c1f5a824
6 changed files with 125 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -20,6 +20,7 @@ using osu.Game.Overlays;
using osu.Game.Overlays.BeatmapSet.Buttons;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
using osuTK;
@ -47,6 +48,10 @@ namespace osu.Game.Screens.Multi
private readonly OsuButton createButton;
private readonly LoungeSubScreen loungeSubScreen;
private readonly ScreenStack screenStack;
private readonly RoomPollingComponent pollingComponent;
[Cached]
private readonly Bindable<FilterCriteria> filter = new Bindable<FilterCriteria>();
[Cached(Type = typeof(IRoomManager))]
private RoomManager roomManager;
@ -99,7 +104,7 @@ namespace osu.Game.Screens.Multi
},
},
},
new Container
roomManager = new RoomManager
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = Header.HEIGHT },
@ -123,9 +128,12 @@ namespace osu.Game.Screens.Multi
Name = { Value = $"{api.LocalUser}'s awesome room" }
}),
},
roomManager = new RoomManager()
pollingComponent = new RoomPollingComponent()
});
pollingComponent.Filter.BindTo(filter);
pollingComponent.RoomsRetrieved += roomManager.UpdateRooms;
screenStack.ScreenPushed += screenPushed;
screenStack.ScreenExited += screenExited;
}
@ -149,8 +157,8 @@ namespace osu.Game.Screens.Multi
private void updatePollingRate(bool idle)
{
roomManager.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000);
Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}");
pollingComponent.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000);
Logger.Log($"Polling adjusted to {pollingComponent.TimeBetweenPolls}");
}
public void APIStateChanged(APIAccess api, APIState state)
@ -213,7 +221,7 @@ namespace osu.Game.Screens.Multi
this.FadeOut(250);
cancelLooping();
roomManager.TimeBetweenPolls = 0;
pollingComponent.TimeBetweenPolls = 0;
}
private void cancelLooping()