Fix failing tests

ppy · Oct 16, 2023 · 7c45d47 · 7c45d47
1 parent fc7f57f
commit 7c45d47
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
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/Audio/Sample/SampleBassFactory.cs b/osu.Framework/Audio/Sample/SampleBassFactory.cs
@@ -18,18 +18,23 @@ namespace osu.Framework.Audio.Sample
     /// </summary>
     internal class SampleBassFactory : SampleFactory
     {
-        public int SampleId { get; private protected set; }
+        public int SampleId { get; private set; }
 
         public override bool IsLoaded => SampleId != 0;
 
         private readonly BassAudioMixer mixer;
 
         private NativeMemoryTracker.NativeMemoryLease? memoryLease;
 
-        public SampleBassFactory(Stream data, string name, BassAudioMixer mixer, int playbackConcurrency)
-            : base(data, name, playbackConcurrency)
+        private byte[]? data;
+
+        public SampleBassFactory(Stream stream, string name, BassAudioMixer mixer, int playbackConcurrency)
+            : base(null, name, playbackConcurrency)
         {
             this.mixer = mixer;
+
+            using (stream)
+                data = stream.ReadAllBytesToArray();
         }
 
         private protected override void UpdatePlaybackConcurrency(ValueChangedEvent<int> concurrency)
@@ -51,33 +56,25 @@ private protected override void LoadSample()
             Debug.Assert(CanPerformInline);
             Debug.Assert(!IsLoaded);
 
-            if (Data == null)
+            if (data == null)
                 return;
 
-            try
-            {
-                byte[] data = Data.ReadAllBytesToArray();
+            int dataLength = data.Length;
 
-                int dataLength = data.Length;
+            const BassFlags flags = BassFlags.Default | BassFlags.SampleOverrideLongestPlaying;
+            using (var handle = new ObjectHandle<byte[]>(data, GCHandleType.Pinned))
+                SampleId = Bass.SampleLoad(handle.Address, 0, dataLength, PlaybackConcurrency.Value, flags);
 
-                const BassFlags flags = BassFlags.Default | BassFlags.SampleOverrideLongestPlaying;
-                using (var handle = new ObjectHandle<byte[]>(data, GCHandleType.Pinned))
-                    SampleId = Bass.SampleLoad(handle.Address, 0, dataLength, PlaybackConcurrency.Value, flags);
+            if (Bass.LastError == Errors.Init)
+                return;
 
-                if (Bass.LastError == Errors.Init)
-                    return;
+            data = null;
 
-                if (!IsLoaded)
-                    return;
+            if (!IsLoaded)
+                return;
 
-                Length = Bass.ChannelBytes2Seconds(SampleId, dataLength) * 1000;
-                memoryLease = NativeMemoryTracker.AddMemory(this, dataLength);
-            }
-            finally
-            {
-                Data.Dispose();
-                Data = null;
-            }
+            Length = Bass.ChannelBytes2Seconds(SampleId, dataLength) * 1000;
+            memoryLease = NativeMemoryTracker.AddMemory(this, dataLength);
         }
 
         public override Sample CreateSample() => new SampleBass(this, mixer) { OnPlay = SampleFactoryOnPlay };
@@ -95,9 +92,7 @@ protected override void Dispose(bool disposing)
                 return;
 
             if (IsLoaded)
-            {
                 memoryLease?.Dispose();
-            }
 
             base.Dispose(disposing);
         }

diff --git a/osu.Framework/Audio/Sample/SampleFactory.cs b/osu.Framework/Audio/Sample/SampleFactory.cs
@@ -25,7 +25,7 @@ internal abstract class SampleFactory : AudioCollectionManager<AdjustableAudioCo
 
         private protected Stream? Data;
 
-        protected SampleFactory(Stream data, string name, int playbackConcurrency)
+        protected SampleFactory(Stream? data, string name, int playbackConcurrency)
         {
             Data = data;
             Name = 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;