Expose async track Start/Stop/Play/Restart methods

osu.Framework/Audio/Track/Track.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Threading.Tasks;
 using osu.Framework.Audio.Mixing;
+using osu.Framework.Extensions;
 
 namespace osu.Framework.Audio.Track
 {
@@ -13,8 +14,8 @@ public abstract class Track : AdjustableAudioComponent, ITrack, IAudioChannel
         public event Action? Completed;
         public event Action? Failed;
 
-        protected virtual void RaiseCompleted() => Completed?.Invoke();
-        protected virtual void RaiseFailed() => Failed?.Invoke();
+        protected void RaiseCompleted() => Completed?.Invoke();
+        protected void RaiseFailed() => Failed?.Invoke();
 
         public virtual bool IsDummyDevice => true;
 
@@ -38,12 +39,14 @@ public virtual void Reset()
         /// <summary>
         /// Restarts this track from the <see cref="RestartPoint"/> while retaining adjustments.
         /// </summary>
-        public virtual void Restart()
+        public void Restart() => RestartAsync().WaitSafely();
+
+        public Task RestartAsync() => EnqueueAction(() =>
         {
             Stop();
             Seek(RestartPoint);
             Start();
-        }
+        });
 
         public virtual void ResetSpeedAdjustments()
         {
@@ -82,15 +85,15 @@ public double Length
         /// <returns>Whether the seek was successful.</returns>
         public abstract bool Seek(double seek);
 
-        public virtual void Start()
-        {
-            if (IsDisposed)
-                throw new ObjectDisposedException(ToString(), "Can not start disposed tracks.");
-        }
+        public abstract Task<bool> SeekAsync(double seek);
 
-        public virtual void Stop()
-        {
-        }
+        public abstract Task StartAsync();
+
+        public abstract void Start();
+
+        public abstract Task StopAsync();
+
+        public abstract void Stop();
 
         public abstract bool IsRunning { get; }
 

osu.Framework/Audio/Track/TrackBass.cs

@@ -220,18 +220,16 @@ protected override void UpdateState()
 
         public override bool IsDummyDevice => false;
 
-        public override void Stop()
-        {
-            base.Stop();
-
-            StopAsync().WaitSafely();
-        }
+        public override void Stop() => StopAsync().WaitSafely();
 
-        public Task StopAsync() => EnqueueAction(() =>
+        public override Task StopAsync()
         {
-            stopInternal();
-            isRunning = isPlayed = false;
-        });
+            return EnqueueAction(() =>
+            {
+                stopInternal();
+                isRunning = isPlayed = false;
+            });
+        }
 
         private void stopInternal()
         {
@@ -251,12 +249,13 @@ private void setDirection(bool reverse)
 
         public override void Start()
         {
-            base.Start();
+            if (IsDisposed)
+                throw new ObjectDisposedException(ToString(), "Can not start disposed tracks.");
 
             StartAsync().WaitSafely();
         }
 
-        public Task StartAsync() => EnqueueAction(() =>
+        public override Task StartAsync() => EnqueueAction(() =>
         {
             if (startInternal())
                 isRunning = isPlayed = true;
@@ -291,7 +290,7 @@ public override bool Looping
 
         public override bool Seek(double seek) => SeekAsync(seek).GetResultSafely();
 
-        public async Task<bool> SeekAsync(double seek)
+        public override async Task<bool> SeekAsync(double seek)
         {
             // At this point the track may not yet be loaded which is indicated by a 0 length.
             // In that case we still want to return true, hence the conservative length.

osu.Framework/Audio/Track/TrackVirtual.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Threading.Tasks;
 using osu.Framework.Timing;
 
 namespace osu.Framework.Audio.Track
@@ -34,6 +35,23 @@ public override bool Seek(double seek)
             return seekOffset == seek;
         }
 
+        public override Task<bool> SeekAsync(double seek)
+        {
+            return Task.FromResult(Seek(seek));
+        }
+
+        public override Task StartAsync()
+        {
+            Start();
+            return Task.CompletedTask;
+        }
+
+        public override Task StopAsync()
+        {
+            Stop();
+            return Task.CompletedTask;
+        }
+
         public override void Start()
         {
             if (Length == 0)

osu.Framework/Graphics/Audio/DrawableTrack.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Threading.Tasks;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Mixing;
 using osu.Framework.Audio.Track;
@@ -93,6 +94,14 @@ public void ResetSpeedAdjustments()
             RemoveAllAdjustments(AdjustableProperty.Tempo);
         }
 
+        public Task RestartAsync() => track.RestartAsync();
+
+        public Task<bool> SeekAsync(double seek) => track.SeekAsync(seek);
+
+        public Task StartAsync() => track.StartAsync();
+
+        public Task StopAsync() => track.StopAsync();
+
         public bool Seek(double seek) => track.Seek(seek);
 
         public void Start() => track.Start();