From 9d150b0ec6d7553ebf5fe30857abb7d48ed5543e Mon Sep 17 00:00:00 2001 From: hwsmm Date: Sat, 23 Sep 2023 00:13:03 +0900 Subject: [PATCH] Fix test build errors from audio component refactoring --- .../Audio/AudioManagerWithDeviceLoss.cs | 2 +- osu.Framework.Tests/Audio/BassTestComponents.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/osu.Framework.Tests/Audio/AudioManagerWithDeviceLoss.cs b/osu.Framework.Tests/Audio/AudioManagerWithDeviceLoss.cs index d1f5977b35..d8cd315425 100644 --- a/osu.Framework.Tests/Audio/AudioManagerWithDeviceLoss.cs +++ b/osu.Framework.Tests/Audio/AudioManagerWithDeviceLoss.cs @@ -14,7 +14,7 @@ namespace osu.Framework.Tests.Audio /// that can simulate the loss of a device. /// This will NOT work without a physical audio device! /// - internal class AudioManagerWithDeviceLoss : AudioManager + internal class AudioManagerWithDeviceLoss : BassAudioManager { public AudioManagerWithDeviceLoss(AudioThread audioThread, ResourceStore trackStore, ResourceStore sampleStore) : base(audioThread, trackStore, sampleStore) diff --git a/osu.Framework.Tests/Audio/BassTestComponents.cs b/osu.Framework.Tests/Audio/BassTestComponents.cs index e95713aaa5..ffe6a48283 100644 --- a/osu.Framework.Tests/Audio/BassTestComponents.cs +++ b/osu.Framework.Tests/Audio/BassTestComponents.cs @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using System; +using System.IO; using System.Threading; using ManagedBass; using osu.Framework.Audio; @@ -36,12 +37,17 @@ 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, getNewTrack); + SampleStore = new SampleStore(Resources, Mixer, getSampleFactory); Add(TrackStore, SampleStore); } + private Track getNewTrack(Stream data, string name) => new TrackBass(data, name); + + private SampleFactory getSampleFactory(byte[] data, string name, int playback_concurrency) + => new SampleBassFactory(data, name, Mixer, playback_concurrency); + public void Init() { AudioThread.PreloadBass();