Merge branch 'master' into fix-zero-width-textbox-throwing

ppy · Jul 18, 2022 · b076c04 · b076c04
2 parents abf68a2 + 08c4006
commit b076c04
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs b/osu.Framework.Tests/Visual/Drawables/TestSceneWaveform.cs
@@ -129,6 +129,8 @@ public void TestWaveformAlpha()
             });
 
             AddUntilStep("wait for load", () => graph.Regenerated);
+
+            AddUntilStep("wait for sampling", () => graph.Waveform.GetPoints().Count > 0);
         }
 
         private void startStop()
@@ -211,6 +213,7 @@ public TestWaveform(Track track, float resolution)
 
             public Waveform Waveform
             {
+                get => graph.Waveform;
                 set => graph.Waveform = value;
             }
 

diff --git a/osu.Framework/Audio/Track/Waveform.cs b/osu.Framework/Audio/Track/Waveform.cs
@@ -81,7 +81,7 @@ public Waveform(Stream data)
             readTask = Task.Run(() =>
             {
                 // for the time being, this code cannot run if there is no bass device available.
-                if (Bass.CurrentDevice <= 0)
+                if (Bass.CurrentDevice < 0)
                 {
                     Logger.Log("Failed to read waveform as no bass device is available.");
                     return;