h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 09:52:53 +08:00
Code Issues Releases Wiki Activity

Explicit disposal via using() to WorkingBeatmap.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-22 14:53:23 +09:00
parent 070c7dc621
commit 7df8324957
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/IO/ArchiveReader.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Beatmaps.IO
public Func<BasicStorage, string, bool> Test { get; set; } public Func<BasicStorage, string, bool> Test { get; set; }
public Type Type { get; set; } public Type Type { get; set; }
} }
private static List<Reader> readers { get; } = new List<Reader>(); private static List<Reader> readers { get; } = new List<Reader>();
public static ArchiveReader GetReader(BasicStorage storage, string path) public static ArchiveReader GetReader(BasicStorage storage, string path)

23
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps
public readonly BeatmapSetInfo BeatmapSetInfo; public readonly BeatmapSetInfo BeatmapSetInfo;
private readonly BeatmapDatabase database; private readonly BeatmapDatabase database;
private ArchiveReader reader => database?.GetReader(BeatmapSetInfo); private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
private Texture background; private Texture background;
private object backgroundLock = new object(); private object backgroundLock = new object();
@ -32,7 +32,8 @@ namespace osu.Game.Beatmaps
try try
{ {
background = new TextureStore(new RawTextureLoaderStore(reader)).Get(BeatmapInfo.Metadata.BackgroundFile); using (var reader = GetReader())
background = new TextureStore(new RawTextureLoaderStore(reader)).Get(BeatmapInfo.Metadata.BackgroundFile);
} }
catch { } catch { }
@ -54,6 +55,7 @@ namespace osu.Game.Beatmaps
try try
{ {
using (var reader = GetReader())
using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path))) using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
beatmap = BeatmapDecoder.GetDecoder(stream)?.Decode(stream); beatmap = BeatmapDecoder.GetDecoder(stream)?.Decode(stream);
} }
@ -77,9 +79,12 @@ namespace osu.Game.Beatmaps
try try
{ {
var trackData = reader?.GetStream(BeatmapInfo.Metadata.AudioFile); using (var reader = GetReader())
if (trackData != null) {
track = new AudioTrackBass(trackData); var trackData = reader?.GetStream(BeatmapInfo.Metadata.AudioFile);
if (trackData != null)
track = new AudioTrackBass(trackData);
}
} }
catch { } catch { }
@ -89,12 +94,6 @@ namespace osu.Game.Beatmaps
set { lock (trackLock) track = value; } set { lock (trackLock) track = value; }
} }
~WorkingBeatmap()
{
Dispose(false);
}
public WorkingBeatmap(Beatmap beatmap) public WorkingBeatmap(Beatmap beatmap)
{ {
this.beatmap = beatmap; this.beatmap = beatmap;
@ -114,7 +113,7 @@ namespace osu.Game.Beatmaps
if (!isDisposed) if (!isDisposed)
{ {
track?.Dispose(); track?.Dispose();
reader?.Dispose(); background?.Dispose();
isDisposed = true; isDisposed = true;
} }
} }