fix: reference counting on winrt decoder

Fooxboy · Apr 26, 2024 · 6985b5f · 6985b5f
1 parent 04f0f42
commit 6985b5f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/MusicX/Services/Player/Sources/BoomMediaSource.cs b/MusicX/Services/Player/Sources/BoomMediaSource.cs
@@ -37,9 +37,9 @@ public override async Task<bool> OpenWithMediaPlayerAsync(MediaPlayer player, Pl
                     ["headers"] = $"Authorization: {_boomService.Client.DefaultRequestHeaders.Authorization}"
                 }, cancellationToken);
 
-            RegisterSourceObjectReference(player, rtMediaSource);
-
             await rtMediaSource.OpenWithMediaPlayerAsync(player).AsTask(cancellationToken);
+
+            RegisterSourceObjectReference(player, rtMediaSource);
         }
         catch (Exception e)
         {

diff --git a/MusicX/Services/Player/Sources/MediaSourceBase.cs b/MusicX/Services/Player/Sources/MediaSourceBase.cs
@@ -194,9 +194,6 @@ protected static void RegisterSourceObjectReference(MediaPlayer player, IWinRTOb
 
         void PlayerOnSourceChanged(MediaPlayer sender, object args)
         {
-            if (!ReferenceEquals(player.Source, rtObject))
-                return;
-
             player.SourceChanged -= PlayerOnSourceChanged;
 
             if (rtObject is IDisposable disposable)

diff --git a/MusicX/Services/Player/Sources/VkMediaSource.cs b/MusicX/Services/Player/Sources/VkMediaSource.cs
@@ -26,10 +26,10 @@ public override async Task<bool> OpenWithMediaPlayerAsync(MediaPlayer player, Pl
         try
         {
             var rtMediaSource = await CreateWinRtMediaSource(vkData, cancellationToken: cancellationToken);
-
-            RegisterSourceObjectReference(player, rtMediaSource);
 
             await rtMediaSource.OpenWithMediaPlayerAsync(player).AsTask(cancellationToken);
+
+            RegisterSourceObjectReference(player, rtMediaSource);
         }
         catch (Exception e)
         {