Fix broken BASS tests

ppy · Oct 30, 2023 · b4a6c58 · b4a6c58
1 parent 949ba72
commit b4a6c58
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/osu.Framework.Tests/Audio/AudioManagerWithDeviceLoss.cs b/osu.Framework.Tests/Audio/AudioManagerWithDeviceLoss.cs
@@ -14,7 +14,7 @@ namespace osu.Framework.Tests.Audio
     /// <see cref="AudioManager"/> that can simulate the loss of a device.
     /// This will NOT work without a physical audio device!
     /// </summary>
-    internal class AudioManagerWithDeviceLoss : AudioManager
+    internal class AudioManagerWithDeviceLoss : BassAudioManager
     {
         public AudioManagerWithDeviceLoss(AudioThread audioThread, ResourceStore<byte[]> trackStore, ResourceStore<byte[]> sampleStore)
             : base(audioThread, trackStore, sampleStore)

diff --git a/osu.Framework.Tests/Audio/BassTestComponents.cs b/osu.Framework.Tests/Audio/BassTestComponents.cs
@@ -9,6 +9,7 @@
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Development;
+using osu.Framework.Extensions;
 using osu.Framework.IO.Stores;
 using osu.Framework.Threading;
 
@@ -36,8 +37,16 @@ public BassTestComponents(bool init = true)
 
             Mixer = CreateMixer();
             Resources = new DllResourceStore(typeof(TrackBassTest).Assembly);
-            TrackStore = new TrackStore(Resources, Mixer);
-            SampleStore = new SampleStore(Resources, Mixer);
+            TrackStore = new TrackStore(Resources, Mixer, (data, name) => new TrackBass(data, name));
+            SampleStore = new SampleStore(Resources, Mixer, (stream, name, mixer, playbackConcurrency) =>
+            {
+                byte[] data;
+
+                using (stream)
+                    data = stream.ReadAllBytesToArray();
+
+                return new SampleBassFactory(data, name, (BassAudioMixer)mixer, playbackConcurrency);
+            });
 
             Add(TrackStore, SampleStore);
         }

diff --git a/osu.Framework.Tests/Visual/Audio/TestSceneAudioManager.cs b/osu.Framework.Tests/Visual/Audio/TestSceneAudioManager.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -65,6 +66,12 @@ public override byte[] Get(string name)
                 return base.Get(name);
             }
 
+            public override Stream GetStream(string name)
+            {
+                attemptedLookups.Add(name);
+                return base.GetStream(name);
+            }
+
             public override Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = default)
             {
                 attemptedLookups.Add(name);

diff --git a/osu.Framework/IO/Stores/ResourceStore.cs b/osu.Framework/IO/Stores/ResourceStore.cs
@@ -125,7 +125,7 @@ public virtual T Get(string name)
             return default;
         }
 
-        public Stream GetStream(string name)
+        public virtual Stream GetStream(string name)
         {
             if (name == null)
                 return null;