Merge remote-tracking branch 'origin/master'

# Conflicts: # AMRPC WatchDog Desktop/Payload.cs # AMRPC WatchDog Desktop/Provider.cs
zephraOSS · Sep 10, 2023 · 9496578 · 9496578
2 parents f060cd7 + 9279470
commit 9496578
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/AMRPC WatchDog Desktop/Payload.cs b/AMRPC WatchDog Desktop/Payload.cs
@@ -6,7 +6,7 @@ namespace AMRPC_WatchDog_Desktop
 {
     public class Payload
     {
-        private string _playingStateValue;
+        private string _playerStateValue;
         private double _endTimeValue = -1;
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -23,13 +23,13 @@ public static class PlayingStatuses
         public string artist { get; set; }
         public string thumbnailPath { get; set; }
 
-        public string playingState
+        public string playerState
         {
-            get => _playingStateValue;
+            get => _playerStateValue;
             set
             {
-                if (value == _playingStateValue) return;
-                _playingStateValue = value;
+                if (value == _playerStateValue) return;
+                _playerStateValue = value;
                 NotifyPropertyChanged();
             }
         }
@@ -56,7 +56,7 @@ public void ResetToInitialState()
             artist = null;
             album = null;
             thumbnailPath = null;
-            playingState = PlayingStatuses.NotStarted;
+            playerState = PlayingStatuses.NotStarted;
             endTime = -1;
         }
     }

diff --git a/AMRPC WatchDog Desktop/Provider.cs b/AMRPC WatchDog Desktop/Provider.cs
@@ -65,7 +65,7 @@ private void OnPlaybackInfoChanged(GlobalSystemMediaTransportControlsSession sen
             var playbackInfo = _ampSession.GetPlaybackInfo();
             var timelineProperties = _ampSession.GetTimelineProperties();
 
-            _payload.playingState = playbackInfo.PlaybackStatus.ToString().ToLower() == Payload.PlayingStatuses.Playing 
+            _payload.playerState = playbackInfo.PlaybackStatus.ToString().ToLower() == Payload.PlayingStatuses.Playing 
                     ? Payload.PlayingStatuses.Playing : Payload.PlayingStatuses.Paused;
 
             Double newEndTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() +