Fix tests

ppy · Oct 24, 2024 · 9887f9c · 9887f9c
1 parent cc00d81
commit 9887f9c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/osu.Framework.Tests/Audio/SampleBassTest.cs b/osu.Framework.Tests/Audio/SampleBassTest.cs
@@ -115,17 +115,5 @@ public void TestPlayingUpdatedAfterInlineStop()
             bass.RunOnAudioThread(() => channel.Stop());
             Assert.That(channel.Playing, Is.False);
         }
-
-        [Test]
-        public void TestChannelLifetime()
-        {
-            channel = sample.Play();
-            bass.Update();
-
-            bass.RunOnAudioThread(() => channel.Stop());
-            bass.Update();
-
-            Assert.That(channel.IsDisposed, Is.True);
-        }
     }
 }
diff --git a/osu.Framework.Tests/Visual/Audio/TestSceneSampleChannels.cs b/osu.Framework.Tests/Visual/Audio/TestSceneSampleChannels.cs
@@ -35,13 +35,12 @@ public void TestPlay()
         }
 
         [Test]
-        public void TestDoesNotRestart()
+        public void TestChannelLifetime()
         {
             SampleChannel channel = null;
 
             AddStep("play channel 1 sample", () => channel = sample.Play());
             AddUntilStep("wait for channel 1 to end", () => !channel.Playing);
-            AddStep("play channel 1 again", () => channel.Play());
 
             int audioFrames = 0;
             AddStep("begin tracking audio frames", () =>
@@ -58,7 +57,7 @@ public void TestDoesNotRestart()
             });
 
             AddUntilStep("wait for two audio frames", () => audioFrames >= 2);
-            AddAssert("channel 1 not playing", () => !channel.Playing);
+            AddAssert("channel 1 disposed", () => channel.IsDisposed);
         }
 
         [Test]

diff --git a/osu.Framework/Audio/Sample/SampleChannel.cs b/osu.Framework/Audio/Sample/SampleChannel.cs
@@ -44,8 +44,6 @@ protected override void UpdateState()
 
         public virtual bool Looping { get; set; }
 
-        public override bool IsAlive => base.IsAlive && Playing;
-
         public virtual ChannelAmplitudes CurrentAmplitudes { get; } = ChannelAmplitudes.Empty;
 
         #region Mixing

diff --git a/osu.Framework/Audio/Sample/SampleChannelBass.cs b/osu.Framework/Audio/Sample/SampleChannelBass.cs
@@ -40,6 +40,12 @@ public override bool Playing
         /// </summary>
         private volatile bool userRequestedPlay;
 
+        /// <summary>
+        /// <c>true</c> if the user last called <see cref="Stop"/>.
+        /// <c>false</c> if the user last called <see cref="Play"/> or this channel finished playback.
+        /// </summary>
+        private volatile bool userRequestedStop;
+
         /// <summary>
         /// Whether the playback start has been enqueued.
         /// </summary>
@@ -55,6 +61,8 @@ public override bool Looping
             }
         }
 
+        public override bool IsAlive => base.IsAlive && (Playing || userRequestedStop);
+
         private bool hasChannel => channel != 0;
 
         public override ChannelAmplitudes CurrentAmplitudes => (bassAmplitudeProcessor ??= new BassAmplitudeProcessor(this)).CurrentAmplitudes;
@@ -99,8 +107,13 @@ protected override void UpdateState()
                         playing = true;
                         break;
 
+                    case PlaybackState.Paused when userRequestedStop:
+                        playing = false;
+                        break;
+
                     default:
                         playing = false;
+                        userRequestedStop = false;
                         break;
                 }
             }
@@ -119,6 +132,8 @@ public override void Play()
         {
             userRequestedPlay = true;
 
+            userRequestedStop = false;
+
             // Pin Playing and IsAlive to true so that the channel isn't killed by the next update. This is only reset after playback is started.
             enqueuedPlaybackStart = true;
 
@@ -138,6 +153,8 @@ public override void Stop()
         {
             userRequestedPlay = false;
 
+            userRequestedStop = true;
+
             base.Stop();
 
             EnqueueAction(() =>