h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Move video store out of TournamentStorage

Browse Source 
There was no reason it should be nested inside.
This commit is contained in:
Dean Herbert 2020-10-19 15:48:15 +09:00
parent 31f6051db9
commit 3f41003d35
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tournament/Components/TourneyVideo.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Video;
using osu.Framework.Platform;
using osu.Framework.Timing;
using osu.Game.Graphics;
using osu.Game.Tournament.IO;
@ -28,9 +27,9 @@ namespace osu.Game.Tournament.Components
}
[BackgroundDependencyLoader]
private void load(Storage storage)
private void load(TournamentVideoResourceStore storage)
{
var stream = (storage as TournamentStorage)?.VideoStore.GetStream(filename);
var stream = storage.GetStream(filename);
if (stream != null)
{

2
osu.Game.Tournament/IO/TournamentStorage.cs
View File

@ -14,7 +14,6 @@ namespace osu.Game.Tournament.IO
private const string default_tournament = "default";
private readonly Storage storage;
private readonly TournamentStorageManager storageConfig;
public TournamentVideoResourceStore VideoStore { get; }
public TournamentStorage(Storage storage)
: base(storage.GetStorageForDirectory("tournaments"), string.Empty)
@ -30,7 +29,6 @@ namespace osu.Game.Tournament.IO
else
Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
VideoStore = new TournamentVideoResourceStore(this);
Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
}