player_thread: pass format to audio_output_all_open() after resume

When playback is unpaused, pass the audio_format to audio_output_all_open(). Don't assume that output_all.c remembers the previous audio format. Also check if there has been an audio format yet.

player_thread: pass format to audio_output_all_open() after resume
d3eccb23 · Max Kellermann · a790b645 · d3eccb23
Commit d3eccb23 authored Mar 10, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 8 deletions

player_thread.c src/player_thread.c +12 -8

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -333,17 +333,21 @@ static void player_process_command(struct player *player)
 		if (player->paused) {
 			audio_output_all_pause();
 			pc.state = PLAYER_STATE_PAUSE;
+		} else if (!audio_format_defined(&player->play_audio_format)) {
+			/* the decoder hasn't provided an audio format
+			   yet - don't open the audio device yet */
+
+			pc.state = PLAYER_STATE_PLAY;
+		} else if (audio_output_all_open(&player->play_audio_format, player_buffer)) {
+			pc.state = PLAYER_STATE_PLAY;
 		} else {
-			if (audio_output_all_open(NULL, player_buffer)) {
-				pc.state = PLAYER_STATE_PLAY;
-			} else {
-				assert(dc.next_song == NULL || dc.next_song->url != NULL);
-				pc.errored_song = dc.next_song;
-				pc.error = PLAYER_ERROR_AUDIO;
+			assert(dc.next_song == NULL || dc.next_song->url != NULL);
+			pc.errored_song = dc.next_song;
+			pc.error = PLAYER_ERROR_AUDIO;

-				player->paused = true;
-			}
+			player->paused = true;
 		}
+
 		player_command_finished();
 		break;