Merge pull request #1227 from peppy/fix-early-track-disposal

Fix tracks no longer getting processed when they complete playback
ppy · Dec 4, 2017 · d2c6d11 · d2c6d11
2 parents e21fc5e + c4de425
commit d2c6d11
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/osu.Framework/Audio/AudioCollectionManager.cs b/osu.Framework/Audio/AudioCollectionManager.cs
@@ -60,7 +60,7 @@ protected override void UpdateState()
             {
                 var item = Items[i];
 
-                if (item.HasCompleted)
+                if (!item.IsAlive)
                 {
                     Items.RemoveAt(i--);
                     continue;

diff --git a/osu.Framework/Audio/AudioComponent.cs b/osu.Framework/Audio/AudioComponent.cs
@@ -48,9 +48,14 @@ public void Update()
         }
 
         /// <summary>
-        /// The component has completed its task and is potentially no longer needed.
+        /// This component has completed playback and is now in a stopped state.
         /// </summary>
-        public virtual bool HasCompleted => IsDisposed;
+        public virtual bool HasCompleted => !IsAlive;
+
+        /// <summary>
+        /// This component has completed all processing and is ready to be removed from its parent.
+        /// </summary>
+        public virtual bool IsAlive => !IsDisposed;
 
         public virtual bool IsLoaded => true;
 

diff --git a/osu.Framework/Audio/Sample/SampleChannel.cs b/osu.Framework/Audio/Sample/SampleChannel.cs
@@ -53,6 +53,6 @@ protected override void UpdateState()
 
         public virtual bool Played => WasStarted && !Playing;
 
-        public override bool HasCompleted => base.HasCompleted || Played;
+        public override bool IsAlive => base.IsAlive && !Played;
     }
 }