Refactor the database code

This commit is contained in:
Drew DeVault
2016-10-18 13:35:01 -04:00
parent 406ffdafbc
commit 449f04c07b
17 changed files with 208 additions and 198 deletions

View File

@ -5,6 +5,7 @@ using System.Linq;
using osu.Game.Beatmaps.Formats;
using osu.Game.Beatmaps.IO;
using osu.Game.Beatmaps;
using osu.Game.Database;
namespace osu.Desktop.Beatmaps.IO
{
@ -31,8 +32,7 @@ namespace osu.Desktop.Beatmaps.IO
using (var stream = new StreamReader(ReadFile(beatmaps[0])))
{
var decoder = BeatmapDecoder.GetDecoder(stream);
firstMap = new Beatmap();
decoder.Decode(stream, firstMap);
firstMap = decoder.Decode(stream);
}
}
@ -48,11 +48,12 @@ namespace osu.Desktop.Beatmaps.IO
public override BeatmapMetadata ReadMetadata()
{
return firstMap.Metadata;
return firstMap.BeatmapInfo.Metadata;
}
public override void Dispose()
{
// no-op
}
}
}
}