Merge pull request #6093 from peppy/disable-wasapi-mode

Disable WASAPI initialisation mode for now
ppy · Dec 27, 2023 · deae25b · deae25b
2 parents 396c9f8 + d87142d
commit deae25b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/osu.Framework/Audio/AudioManager.cs b/osu.Framework/Audio/AudioManager.cs
@@ -394,7 +394,7 @@ protected virtual bool InitBass(int device)
                 return true;
 
             // this likely doesn't help us but also doesn't seem to cause any issues or any cpu increase.
-            Bass.UpdatePeriod = 1;
+            Bass.UpdatePeriod = 5;
 
             // reduce latency to a known sane minimum.
             Bass.DeviceBufferLength = 10;

diff --git a/osu.Framework/Threading/AudioThread.cs b/osu.Framework/Threading/AudioThread.cs
@@ -138,7 +138,9 @@ internal bool InitDevice(int deviceId)
             if (!Bass.Init(deviceId, Flags: (DeviceInitFlags)128)) // 128 == BASS_DEVICE_REINIT
                 return false;
 
-            attemptWasapiInitialisation();
+            // 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();
 
             initialised_devices.Add(deviceId);
             return true;
@@ -236,7 +238,7 @@ private void initWasapi(int wasapiDevice)
                 }
             });
 
-            bool initialised = BassWasapi.Init(wasapiDevice, Procedure: wasapiProcedure, Buffer: 0.001f, Period: 0.001f);
+            bool initialised = BassWasapi.Init(wasapiDevice, Procedure: wasapiProcedure, Buffer: 0.02f, Period: 0.01f);
 
             if (!initialised)
                 return;