Merge pull request #11226 from peppy/fix-legacy-skin-texture-loader-store

Fix incorrectly provided texture loader store to skins

osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs

@@ -10,9 +10,11 @@ using NUnit.Framework;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Audio;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -27,7 +29,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneStoryboardSamples : OsuTestScene
+    public class TestSceneStoryboardSamples : OsuTestScene, IStorageResourceProvider
     {
         [Test]
         public void TestRetrieveTopLevelSample()
@@ -35,7 +37,7 @@ namespace osu.Game.Tests.Gameplay
             ISkin skin = null;
             SampleChannel channel = null;
 
-            AddStep("create skin", () => skin = new TestSkin("test-sample", Audio));
+            AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
 
             AddAssert("sample is non-null", () => channel != null);
@@ -47,7 +49,7 @@ namespace osu.Game.Tests.Gameplay
             ISkin skin = null;
             SampleChannel channel = null;
 
-            AddStep("create skin", () => skin = new TestSkin("folder/test-sample", Audio));
+            AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
 
             AddAssert("sample is non-null", () => channel != null);
@@ -105,7 +107,7 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("setup storyboard sample", () =>
             {
-                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
+                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, this);
                 SelectedMods.Value = new[] { testedMod };
 
                 var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
@@ -128,8 +130,8 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestSkin : LegacySkin
         {
-            public TestSkin(string resourceName, AudioManager audioManager)
+            public TestSkin(string resourceName, IStorageResourceProvider resources)
-                : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), audioManager, "skin.ini")
+                : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), resources, "skin.ini")
             {
             }
         }
@@ -158,15 +160,15 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestCustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
         {
-            private readonly AudioManager audio;
+            private readonly IStorageResourceProvider resources;
 
-            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, AudioManager audio)
+            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, IStorageResourceProvider resources)
-                : base(ruleset, null, audio)
+                : base(ruleset, null, resources.AudioManager)
             {
-                this.audio = audio;
+                this.resources = resources;
             }
 
-            protected override ISkin GetSkin() => new TestSkin("test-sample", audio);
+            protected override ISkin GetSkin() => new TestSkin("test-sample", resources);
         }
 
         private class TestDrawableStoryboardSample : DrawableStoryboardSample
@@ -176,5 +178,13 @@ namespace osu.Game.Tests.Gameplay
             {
             }
         }
+
+        #region IResourceStorageProvider
+
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
+
+        #endregion
     }
 }

osu.Game/Beatmaps/BeatmapManager.cs

@@ -16,6 +16,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -28,8 +29,8 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Users;
 using osu.Game.Skinning;
+using osu.Game.Users;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Beatmaps
@@ -38,7 +39,7 @@ namespace osu.Game.Beatmaps
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
     [ExcludeFromDynamicCompile]
-    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable
+    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable, IBeatmapResourceProvider
     {
         /// <summary>
         /// Fired when a single difficulty has been hidden.
@@ -68,9 +69,12 @@ namespace osu.Game.Beatmaps
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
         private readonly AudioManager audioManager;
-        private readonly TextureStore textureStore;
+        private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
+        [CanBeNull]
+        private readonly GameHost host;
+
         [CanBeNull]
         private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
 
@@ -80,6 +84,7 @@ namespace osu.Game.Beatmaps
         {
             this.rulesets = rulesets;
             this.audioManager = audioManager;
+            this.host = host;
 
             DefaultBeatmap = defaultBeatmap;
 
@@ -92,7 +97,7 @@ namespace osu.Game.Beatmaps
             if (performOnlineLookups)
                 onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
 
-            textureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
+            largeTextureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
             trackStore = audioManager.GetTrackStore(Files.Store);
         }
 
@@ -302,7 +307,7 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager));
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
 
                 return working;
             }
@@ -492,6 +497,16 @@ namespace osu.Game.Beatmaps
             onlineLookupQueue?.Dispose();
         }
 
+        #region IResourceStorageProvider
+
+        TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
+        ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
+        AudioManager IStorageResourceProvider.AudioManager => audioManager;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host?.CreateTextureLoaderStore(underlyingStore);
+
+        #endregion
+
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
         /// </summary>

osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs

@@ -2,11 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
@@ -21,16 +20,13 @@ namespace osu.Game.Beatmaps
         [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
-            private readonly IResourceStore<byte[]> store;
+            [NotNull]
-            private readonly TextureStore textureStore;
+            private readonly IBeatmapResourceProvider resources;
-            private readonly ITrackStore trackStore;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
+            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, [NotNull] IBeatmapResourceProvider resources)
-                : base(beatmapInfo, audioManager)
+                : base(beatmapInfo, resources.AudioManager)
             {
-                this.store = store;
+                this.resources = resources;
-                this.textureStore = textureStore;
-                this.trackStore = trackStore;
             }
 
             protected override IBeatmap GetBeatmap()
@@ -40,7 +36,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
                 catch (Exception e)
@@ -61,7 +57,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return resources.LargeTextureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -77,7 +73,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return trackStore.Get(getPathForFile(Metadata.AudioFile));
+                    return resources.Tracks.Get(getPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {
@@ -93,7 +89,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
+                    var trackData = resources.Files.GetStream(getPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
                 catch (Exception e)
@@ -109,7 +105,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
                     {
                         var decoder = Decoder.GetDecoder<Storyboard>(stream);
 
@@ -118,7 +114,7 @@ namespace osu.Game.Beatmaps
                             storyboard = decoder.Decode(stream);
                         else
                         {
-                            using (var secondaryStream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                            using (var secondaryStream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
                                 storyboard = decoder.Decode(stream, secondaryStream);
                         }
                     }
@@ -138,7 +134,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return new LegacyBeatmapSkin(BeatmapInfo, store, AudioManager);
+                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, resources);
                 }
                 catch (Exception e)
                 {

osu.Game/Beatmaps/IBeatmapResourceProvider.cs

@@ -0,0 +1,22 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.IO;
+
+namespace osu.Game.Beatmaps
+{
+    public interface IBeatmapResourceProvider : IStorageResourceProvider
+    {
+        /// <summary>
+        /// Retrieve a global large texture store, used for loading beatmap backgrounds.
+        /// </summary>
+        TextureStore LargeTextureStore { get; }
+
+        /// <summary>
+        /// Access a global track store for retrieving beatmap tracks from.
+        /// </summary>
+        ITrackStore Tracks { get; }
+    }
+}

osu.Game/IO/IStorageResourceProvider.cs

@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Audio;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.IO
+{
+    public interface IStorageResourceProvider
+    {
+        /// <summary>
+        /// Retrieve the game-wide audio manager.
+        /// </summary>
+        AudioManager AudioManager { get; }
+
+        /// <summary>
+        /// Access game-wide user files.
+        /// </summary>
+        IResourceStore<byte[]> Files { get; }
+
+        /// <summary>
+        /// Create a texture loader store based on an underlying data store.
+        /// </summary>
+        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
+        /// <returns>A texture loader store.</returns>
+        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
+    }
+}

osu.Game/Skinning/DefaultLegacySkin.cs

@@ -1,16 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
+using osu.Game.IO;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
-        public DefaultLegacySkin(IResourceStore<byte[]> storage, AudioManager audioManager)
+        public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(Info, storage, audioManager, string.Empty)
+            : base(Info, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(

osu.Game/Skinning/LegacyBeatmapSkin.cs

@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
@@ -16,8 +16,8 @@ namespace osu.Game.Skinning
         protected override bool AllowManiaSkin => false;
         protected override bool UseCustomSampleBanks => true;
 
-        public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, AudioManager audioManager)
+        public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), audioManager, beatmap.Path)
+            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path)
         {
             // Disallow default colours fallback on beatmap skins to allow using parent skin combo colours. (via SkinProvidingContainer)
             Configuration.AllowDefaultComboColoursFallback = false;

osu.Game/Skinning/LegacySkin.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -54,12 +53,12 @@ namespace osu.Game.Skinning
 
         private readonly Dictionary<int, LegacyManiaSkinConfiguration> maniaConfigurations = new Dictionary<int, LegacyManiaSkinConfiguration>();
 
-        public LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager)
+        public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
-            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, storage), audioManager, "skin.ini")
+            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini")
         {
         }
 
-        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, string filename)
+        protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string filename)
             : base(skin)
         {
             using (var stream = storage?.GetStream(filename))
@@ -85,12 +84,12 @@ namespace osu.Game.Skinning
 
             if (storage != null)
             {
-                var samples = audioManager?.GetSampleStore(storage);
+                var samples = resources?.AudioManager?.GetSampleStore(storage);
                 if (samples != null)
                     samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
 
                 Samples = samples;
-                Textures = new TextureStore(new TextureLoaderStore(storage));
+                Textures = new TextureStore(resources?.CreateTextureLoaderStore(storage));
 
                 (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
             }

osu.Game/Skinning/SkinManager.cs

@@ -22,15 +22,18 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 
 namespace osu.Game.Skinning
 {
     [ExcludeFromDynamicCompile]
-    public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource
+    public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource, IStorageResourceProvider
     {
         private readonly AudioManager audio;
 
+        private readonly GameHost host;
+
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
@@ -42,10 +45,12 @@ namespace osu.Game.Skinning
 
         protected override string ImportFromStablePath => "Skins";
 
-        public SkinManager(Storage storage, DatabaseContextFactory contextFactory, IIpcHost importHost, AudioManager audio, IResourceStore<byte[]> legacyDefaultResources)
+        public SkinManager(Storage storage, DatabaseContextFactory contextFactory, GameHost host, AudioManager audio, IResourceStore<byte[]> legacyDefaultResources)
-            : base(storage, contextFactory, new SkinStore(contextFactory, storage), importHost)
+            : base(storage, contextFactory, new SkinStore(contextFactory, storage), host)
         {
             this.audio = audio;
+            this.host = host;
+
             this.legacyDefaultResources = legacyDefaultResources;
 
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
@@ -148,9 +153,9 @@ namespace osu.Game.Skinning
                 return new DefaultSkin();
 
             if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, audio);
+                return new DefaultLegacySkin(legacyDefaultResources, this);
 
-            return new LegacySkin(skinInfo, Files.Store, audio);
+            return new LegacySkin(skinInfo, this);
         }
 
         /// <summary>
@@ -169,5 +174,13 @@ namespace osu.Game.Skinning
         public SampleChannel GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
+
+        #region IResourceStorageProvider
+
+        AudioManager IStorageResourceProvider.AudioManager => audio;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
+        #endregion
     }
 }

osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
@@ -25,7 +26,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Beatmaps
 {
     [HeadlessTest]
-    public abstract class HitObjectSampleTest : PlayerTestScene
+    public abstract class HitObjectSampleTest : PlayerTestScene, IStorageResourceProvider
     {
         protected abstract IResourceStore<byte[]> Resources { get; }
         protected LegacySkin Skin { get; private set; }
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Beatmaps
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
 
         protected sealed override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
+            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, this);
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false);
 
@@ -109,7 +110,7 @@ namespace osu.Game.Tests.Beatmaps
                 };
 
                 // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
+                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, this));
             });
         }
 
@@ -122,6 +123,14 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertNoLookup(string name) => AddAssert($"\"{name}\" not looked up",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && !userSkinResourceStore.PerformedLookups.Contains(name));
 
+        #region IResourceStorageProvider
+
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => userSkinResourceStore;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
+
+        #endregion
+
         private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;
@@ -191,14 +200,17 @@ namespace osu.Game.Tests.Beatmaps
             private readonly BeatmapInfo skinBeatmapInfo;
             private readonly IResourceStore<byte[]> resourceStore;
 
-            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
+            private readonly IStorageResourceProvider resources;
-                : base(beatmap, storyboard, referenceClock, audio)
+
+            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, IStorageResourceProvider resources)
+                : base(beatmap, storyboard, referenceClock, resources.AudioManager)
             {
                 this.skinBeatmapInfo = skinBeatmapInfo;
                 this.resourceStore = resourceStore;
+                this.resources = resources;
             }
 
-            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, resources);
         }
     }
 }

osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs

@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
@@ -18,9 +17,9 @@ namespace osu.Game.Tests.Visual
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuGameBase game)
+        private void load(OsuGameBase game, SkinManager skins)
         {
-            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
+            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), skins);
             legacySkinSource = new SkinProvidingContainer(legacySkin);
         }
 

osu.Game/Tests/Visual/SkinnableTestScene.cs

@@ -13,8 +13,10 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osuTK;
@@ -22,13 +24,16 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class SkinnableTestScene : OsuGridTestScene
+    public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
     {
         private Skin metricsSkin;
         private Skin defaultSkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         protected SkinnableTestScene()
             : base(2, 3)
         {
@@ -39,10 +44,10 @@ namespace osu.Game.Tests.Visual
         {
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
-            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
+            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
-            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
+            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), this);
-            specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
+            specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
-            oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
+            oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }
 
         private readonly List<Drawable> createdDrawables = new List<Drawable>();
@@ -147,6 +152,14 @@ namespace osu.Game.Tests.Visual
 
         protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
 
+        #region IResourceStorageProvider
+
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
+        #endregion
+
         private class OutlineBox : CompositeDrawable
         {
             public OutlineBox()
@@ -170,8 +183,8 @@ namespace osu.Game.Tests.Visual
         {
             private readonly bool extrapolateAnimations;
 
-            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, bool extrapolateAnimations)
-                : base(skin, storage, audioManager, "skin.ini")
+                : base(skin, storage, resources, "skin.ini")
             {
                 this.extrapolateAnimations = extrapolateAnimations;
             }