Merge pull request #6655 from peppy/envvar-wasapi-experiment

Allow enabling wasapi experimental initialisation via environment variable

Author: peppy

osu.Framework/FrameworkEnvironment.cs

@@ -21,6 +21,7 @@ public static class FrameworkEnvironment
         public static bool NoStructuredBuffers { get; }
         public static string? DeferredRendererEventsOutputPath { get; }
         public static bool UseSDL3 { get; }
+        public static bool UseWasapi { get; }
 
         /// <summary>
         /// Whether non-SSL requests should be allowed. Debug only. Defaults to disabled.
@@ -55,6 +56,8 @@ static FrameworkEnvironment()
 
             // Desktop has many issues, see https://github.com/ppy/osu-framework/issues/6540.
             UseSDL3 = RuntimeInfo.IsMobile || (parseBool(Environment.GetEnvironmentVariable("OSU_SDL3")) ?? false);
+
+            UseWasapi = parseBool(Environment.GetEnvironmentVariable("OSU_AUDIO_WASAPI_EXPERIMENTAL")) ?? false;
         }
 
         private static bool? parseBool(string? value)

osu.Framework/Threading/AudioThread.cs

@@ -138,9 +138,10 @@ internal bool InitDevice(int deviceId)
             if (!Bass.Init(deviceId, Flags: (DeviceInitFlags)128)) // 128 == BASS_DEVICE_REINIT
                 return false;
 
-            // Need to do more testing. Users reporting buffer underruns even with a large (20ms) buffer.
-            // Also playback latency improvements are not present across all users.
-            // attemptWasapiInitialisation();
+            // That this has not been mass-tested since https://github.com/ppy/osu-framework/pull/6651 and probably needs to be.
+            // Currently envvar gated for users to test at their own discretion.
+            if (FrameworkEnvironment.UseWasapi)
+                attemptWasapiInitialisation();
 
             initialised_devices.Add(deviceId);
             return true;