Added Latest updated media state information

Fixed not unsubscribing from some events, causing re-enabling the plugin breaking most of the things

Author: aytac.kayadelen

Artemis.MediaInfo/DataModels/MediaInfoDataModel.cs

@@ -1,4 +1,5 @@
-using Artemis.Core;
+using Windows.Media.Control;
+using Artemis.Core;
 using Artemis.Core.Modules;
 
 namespace Artemis.MediaInfo.DataModels
@@ -16,5 +17,10 @@ public class MediaInfoDataModel : DataModel
 
         [DataModelProperty(Name = "Previous media can be played")]
         public bool HasPreviousMedia { get; set; }
+        
+        [DataModelProperty(Name = "Latest updated media state",
+            Description = " Note that there may be other media sessions. " +
+                          "Other values become true when any of the sessions meet the conditions.")]
+        public GlobalSystemMediaTransportControlsSessionPlaybackStatus MediaState { get; set; }
     }
 }

Artemis.MediaInfo/MediaInfoModule.cs

@@ -11,25 +11,25 @@ namespace Artemis.MediaInfo
     [PluginFeature(Name = "MediaInfo")]
     public class MediaInfoModule : Module<MediaInfoDataModel>
     {
-        private readonly MediaManager _mediaManager = new();
+        private MediaManager _mediaManager;
 
         public override List<IModuleActivationRequirement> ActivationRequirements { get; } = new();
 
-        private readonly List<string> _mediaSessions = new();
+        private List<string> _mediaSessions = new();
 
         public override void Enable()
         {
+            _mediaManager = new MediaManager();
             _mediaManager.OnAnySessionOpened += MediaManager_OnSessionOpened;
             _mediaManager.OnAnySessionClosed += MediaManager_OnAnySessionClosed;
             _mediaManager.OnAnyPlaybackStateChanged += MediaManager_OnAnyPlaybackStateChanged;
 
             _mediaManager.Start();
-            while(!_mediaManager.IsStarted){}
-            
+
             DataModel.HasMedia = _mediaManager.CurrentMediaSessions.Count > 0;
 
             if (_mediaManager.CurrentMediaSessions.Count == 0) return;
-            
+            _mediaSessions = new List<string>(_mediaManager.CurrentMediaSessions.Select(pair => pair.Value.Id));
 
             DataModel.HasNextMedia = _mediaManager.CurrentMediaSessions.Any(pair => pair.Value.ControlSession.GetPlaybackInfo().Controls.IsNextEnabled);
             DataModel.HasPreviousMedia = _mediaManager.CurrentMediaSessions.Any(pair => pair.Value.ControlSession.GetPlaybackInfo().Controls.IsPreviousEnabled);
@@ -39,9 +39,16 @@ public override void Enable()
 
         public override void Disable()
         {
+            foreach (var (_, mediaSession) in _mediaManager.CurrentMediaSessions)
+            {
+                mediaSession.OnSessionClosed -= MediaManager_OnAnySessionClosed;
+            }
+            
             _mediaManager.OnAnySessionOpened -= MediaManager_OnSessionOpened;
             _mediaManager.OnAnySessionClosed -= MediaManager_OnAnySessionClosed;
             _mediaManager.OnAnyPlaybackStateChanged -= MediaManager_OnAnyPlaybackStateChanged;
+            _mediaManager.Dispose();
+            _mediaManager = null;
         }
 
         public override void Update(double deltaTime)
@@ -59,19 +66,19 @@ public override void ModuleDeactivated(bool isOverride)
 
         }
 
-        private void MediaManager_OnSessionOpened(MediaManager.MediaSession mediasession)
+        private void MediaManager_OnSessionOpened(MediaManager.MediaSession mediaSession)
         {
             DataModel.HasMedia = true;
 
-            _mediaSessions.Add(mediasession.Id);
+            _mediaSessions.Add(mediaSession.Id);
 
-            mediasession.OnSessionClosed += MediaManager_OnAnySessionClosed;
+            mediaSession.OnSessionClosed += MediaManager_OnAnySessionClosed;
         }
 
-        private void MediaManager_OnAnySessionClosed(MediaManager.MediaSession mediasession)
+        private void MediaManager_OnAnySessionClosed(MediaManager.MediaSession mediaSession)
         {
-            mediasession.OnSessionClosed -= MediaManager_OnAnySessionClosed;
-            _mediaSessions.Remove(mediasession.Id);
+            mediaSession.OnSessionClosed -= MediaManager_OnAnySessionClosed;
+            _mediaSessions.Remove(mediaSession.Id);
 
             if (_mediaSessions.Count == 0)
             {
@@ -85,9 +92,11 @@ private void MediaManager_OnAnySessionClosed(MediaManager.MediaSession mediasess
             }
         }
 
-        private void MediaManager_OnAnyPlaybackStateChanged(MediaManager.MediaSession mediasession, GlobalSystemMediaTransportControlsSessionPlaybackInfo playbackinfo)
+        private void MediaManager_OnAnyPlaybackStateChanged(MediaManager.MediaSession mediaSession,
+            GlobalSystemMediaTransportControlsSessionPlaybackInfo playbackInfo)
         {
             UpdateButtons();
+            DataModel.MediaState = playbackInfo.PlaybackStatus;
         }
 
         private void UpdateButtons()

Artemis.MediaInfo/plugin.json

@@ -6,5 +6,5 @@
 	"Main": "Artemis.MediaInfo.dll",
 	"Name": "Media Info",
 	"Repository": "https://github.com/Aytackydln/Artemis.MediaInfo",
-	"Version": "0.0.1.0"
+	"Version": "0.0.2.0"
 }