Fix intermittent Playing state on short looping samples

smoogipoo · Jul 11, 2024 · c7b5052 · c7b5052
1 parent 4f51628
commit c7b5052
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/osu.Framework/Audio/Sample/SampleChannelBass.cs b/osu.Framework/Audio/Sample/SampleChannelBass.cs
@@ -19,7 +19,18 @@ internal sealed class SampleChannelBass : SampleChannel, IBassAudioChannel
         /// <remarks>
         /// This is set to <c>true</c> immediately upon <see cref="Play"/>, but the channel may not be audibly playing yet.
         /// </remarks>
-        public override bool Playing => playing || enqueuedPlaybackStart;
+        public override bool Playing
+        {
+            get
+            {
+                // When short samples loop (especially within mixers), there's a small window where the ChannelIsActive state could be Stopped.
+                // In order to not provide a "stale" value here, we'll not trust the internal playing state from BASS.
+                if (Looping && userRequestedPlay)
+                    return true;
+
+                return playing || enqueuedPlaybackStart;
+            }
+        }
 
         private volatile bool playing;