Rename method for fetching playback context

calledude · Feb 25, 2024 · f4412e8 · f4412e8
1 parent f10fa75
commit f4412e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/SpotifyVolumeExtension/Monitoring/SpotifyMonitor.cs b/SpotifyVolumeExtension/Monitoring/SpotifyMonitor.cs
@@ -126,8 +126,8 @@ public bool SpotifyIsRunning()
 
 	private async Task<bool> IsPlayingMusic()
 	{
-		var pb = await _spotifyClient.GetPlaybackContext();
-		return pb?.IsPlaying ?? false;
+		var currentPlaybackContext = await _spotifyClient.GetCurrentPlayback();
+		return currentPlaybackContext?.IsPlaying ?? false;
 	}
 
 	public void Dispose()

diff --git a/SpotifyVolumeExtension/Monitoring/StatusController.cs b/SpotifyVolumeExtension/Monitoring/StatusController.cs
@@ -81,7 +81,7 @@ public async Task<bool> CheckStateImmediate()
 	{
 		if (_processMonitorService.ProcessIsRunning())
 		{
-			var playbackContext = await _spotifyClient.GetPlaybackContext();
+			var playbackContext = await _spotifyClient.GetCurrentPlayback();
 			await OnStateChange(playbackContext?.IsPlaying ?? _lastState, playbackContext);
 		}
 		else

diff --git a/SpotifyVolumeExtension/Spotify/SpotifyApiClient.cs b/SpotifyVolumeExtension/Spotify/SpotifyApiClient.cs
@@ -16,7 +16,7 @@ public SpotifyApiClient(Retry retrier, SpotifyClient client)
 		_client = client;
 	}
 
-	public async Task<CurrentlyPlayingContext?> GetPlaybackContext()
+	public async Task<CurrentlyPlayingContext?> GetCurrentPlayback()
 		=> await _retrier.Wrap(() => _client.Player.GetCurrentPlayback());
 
 	public async Task<bool> SetVolume(int volumePercent)

diff --git a/SpotifyVolumeExtension/Volume/SpotifyVolumeController.cs b/SpotifyVolumeExtension/Volume/SpotifyVolumeController.cs
@@ -55,16 +55,16 @@ public override void Stop()
 	protected override async Task<int> GetBaselineVolume()
 	{
 		_logger.LogTrace("Fetching baseline volume");
-		var playbackContext = await _spotifyClient.GetPlaybackContext();
-		while (!playbackContext.IsPlaying)
+		var playbackContext = await _spotifyClient.GetCurrentPlayback();
+		while (playbackContext == null || !playbackContext.IsPlaying)
 		{
 			_logger.LogTrace("Failed to fetch baseline volume");
 			await Task.Delay(500);
-			playbackContext = await _spotifyClient.GetPlaybackContext();
+			playbackContext = await _spotifyClient.GetCurrentPlayback();
 		}
 
 		_logger.LogTrace("Fetched baseline volume");
-		return playbackContext.Device.VolumePercent.Value;
+		return playbackContext.Device.VolumePercent ?? 0;
 	}
 
 	private async Task VolumeKeyPressed(MediaKeyEventArgs m)