Merge pull request JohnnyCrazy#70 from JimmyAppelt/events

Events

Author: JohnnyCrazy

SpotifyAPI.Example/LocalControl.cs

@@ -102,23 +102,23 @@ public void UpdatePlayingStatus(bool playing)
             isPlayingLabel.Text = playing.ToString();
         }
 
-        private void _spotify_OnVolumeChange(VolumeChangeEventArgs e)
+        private void _spotify_OnVolumeChange(object sender, VolumeChangeEventArgs e)
         {
             volumeLabel.Text = (e.NewVolume * 100).ToString(CultureInfo.InvariantCulture);
         }
 
-        private void _spotify_OnTrackTimeChange(TrackTimeChangeEventArgs e)
+        private void _spotify_OnTrackTimeChange(object sender, TrackTimeChangeEventArgs e)
         {
             timeLabel.Text = $"{FormatTime(e.TrackTime)}/{FormatTime(_currentTrack.Length)}";
             timeProgressBar.Value = (int)e.TrackTime;
         }
 
-        private void _spotify_OnTrackChange(TrackChangeEventArgs e)
+        private void _spotify_OnTrackChange(object sender, TrackChangeEventArgs e)
         {
             UpdateTrack(e.NewTrack);
         }
 
-        private void _spotify_OnPlayStateChange(PlayStateEventArgs e)
+        private void _spotify_OnPlayStateChange(object sender, PlayStateEventArgs e)
         {
             UpdatePlayingStatus(e.Playing);
         }

SpotifyAPI/Local/SpotifyLocalAPI.cs

@@ -52,21 +52,13 @@ public ISynchronizeInvoke SynchronizingObject
         private readonly Timer _eventTimer;
         private StatusResponse _eventStatusResponse;
 
-        public delegate void TrackChangeEventHandler(TrackChangeEventArgs e);
+        public event EventHandler<TrackChangeEventArgs> OnTrackChange;
 
-        public delegate void PlayStateEventHandler(PlayStateEventArgs e);
+        public event EventHandler<PlayStateEventArgs> OnPlayStateChange;
 
-        public delegate void VolumeChangeEventHandler(VolumeChangeEventArgs e);
+        public event EventHandler<VolumeChangeEventArgs> OnVolumeChange;
 
-        public delegate void TrackTimeChangeEventHandler(TrackTimeChangeEventArgs e);
-
-        public event TrackChangeEventHandler OnTrackChange;
-
-        public event PlayStateEventHandler OnPlayStateChange;
-
-        public event VolumeChangeEventHandler OnVolumeChange;
-
-        public event TrackTimeChangeEventHandler OnTrackTimeChange;
+        public event EventHandler<TrackTimeChangeEventArgs> OnTrackTimeChange;
 
         public SpotifyLocalAPI()
         {
@@ -104,7 +96,7 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)
             {
                 if (newStatusResponse.Track.TrackResource?.Name != _eventStatusResponse.Track.TrackResource?.Name)
                 {
-                    OnTrackChange?.Invoke(new TrackChangeEventArgs()
+                    OnTrackChange?.Invoke(this, new TrackChangeEventArgs()
                     {
                         OldTrack = _eventStatusResponse.Track,
                         NewTrack = newStatusResponse.Track
@@ -113,22 +105,22 @@ private void ElapsedTick(object sender, ElapsedEventArgs e)
             }
             if (newStatusResponse.Playing != _eventStatusResponse.Playing)
             {
-                OnPlayStateChange?.Invoke(new PlayStateEventArgs()
+                OnPlayStateChange?.Invoke(this, new PlayStateEventArgs()
                 {
                     Playing = newStatusResponse.Playing
                 });
             }
             if (newStatusResponse.Volume != _eventStatusResponse.Volume)
             {
-                OnVolumeChange?.Invoke(new VolumeChangeEventArgs()
+                OnVolumeChange?.Invoke(this, new VolumeChangeEventArgs()
                 {
                     OldVolume = _eventStatusResponse.Volume,
                     NewVolume = newStatusResponse.Volume
                 });
             }
             if (newStatusResponse.PlayingPosition != _eventStatusResponse.PlayingPosition)
             {
-                OnTrackTimeChange?.Invoke(new TrackTimeChangeEventArgs()
+                OnTrackTimeChange?.Invoke(this, new TrackTimeChangeEventArgs()
                 {
                     TrackTime = newStatusResponse.PlayingPosition
                 });