player_thread: set error status in play_next_chunk()

Don't set the error in play_chunk(); do all the error handling in the caller. The errored_song attribute isn't set anymore; it doesn't make sense for PLAYER_ERROR_AUDIO.

player_thread: set error status in play_next_chunk()
4748decd · Max Kellermann · 975143ab · 4748decd
Commit 4748decd authored Oct 29, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

player_thread.c src/player_thread.c +3 -4

No files found.
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -472,11 +472,8 @@ play_chunk(struct song *song, struct music_chunk *chunk,

 	/* send the chunk to the audio outputs */

-	if (!audio_output_all_play(chunk)) {
-		pc.errored_song = dc.current_song;
-		pc.error = PLAYER_ERROR_AUDIO;
+	if (!audio_output_all_play(chunk))
 		return false;
-	}

 	pc.total_play_time += (double)chunk->length /
 		audio_format_time_to_size(format);
@@ -562,6 +559,8 @@ play_next_chunk(struct player *player)
 	if (!success) {
 		music_buffer_return(player_buffer, chunk);

+		pc.error = PLAYER_ERROR_AUDIO;
+
 		/* pause: the user may resume playback as soon as an
 		   audio output becomes available */
 		pc.state = PLAYER_STATE_PAUSE;