From f0604495b88205a11a8ee1323779c8445694dc1d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 25 Dec 2023 15:27:41 +0900 Subject: [PATCH] Rename concept of "global" mixer with "fallback" --- osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs b/osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs index d72aafc7a1b..21074509c13 100644 --- a/osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs +++ b/osu.Framework/Audio/Mixing/Bass/BassAudioMixer.cs @@ -252,8 +252,8 @@ public void UpdateDevice(int deviceIndex) { ManagedBass.Bass.ChannelSetDevice(Handle, deviceIndex); - if (AudioThread.WasapiMixer != 0) - BassMix.MixerAddChannel(AudioThread.WasapiMixer, Handle, BassFlags.MixerChanBuffer | BassFlags.MixerChanNoRampin); + if (AudioThread.GlobalMixer != 0) + BassMix.MixerAddChannel(AudioThread.GlobalMixer, Handle, BassFlags.MixerChanBuffer | BassFlags.MixerChanNoRampin); } } @@ -283,7 +283,7 @@ private void createMixer() if (!ManagedBass.Bass.GetDeviceInfo(ManagedBass.Bass.CurrentDevice, out var deviceInfo) || !deviceInfo.IsInitialized) return; - Handle = AudioThread.WasapiMixer != 0 + Handle = AudioThread.GlobalMixer != 0 ? BassMix.CreateMixerStream(frequency, 2, BassFlags.MixerNonStop | BassFlags.Decode) : BassMix.CreateMixerStream(frequency, 2, BassFlags.MixerNonStop); @@ -301,8 +301,8 @@ private void createMixer() Effects.BindCollectionChanged(onEffectsChanged, true); - if (AudioThread.WasapiMixer != 0) - BassMix.MixerAddChannel(AudioThread.WasapiMixer, Handle, BassFlags.MixerChanBuffer | BassFlags.MixerChanNoRampin); + if (AudioThread.GlobalMixer != 0) + BassMix.MixerAddChannel(AudioThread.GlobalMixer, Handle, BassFlags.MixerChanBuffer | BassFlags.MixerChanNoRampin); ManagedBass.Bass.ChannelPlay(Handle); }