player_thread: implement missing "idle" events on output errors

When all outputs fail, MPD automatically pauses playback, but did not emit the IDLE_PLAYER event. Thus, clients were not woken up. (Mantis 3665)

player_thread: implement missing "idle" events on output errors
96dc0a31 · Max Kellermann · 1105e61f · 96dc0a31 · 96dc0a31
Commit 96dc0a31 authored Feb 04, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

NEWS NEWS +2 -0

player_thread.c src/player_thread.c +9 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.17.4 (2013/??/??)
 * decoder:
  - ffmpeg: support float planar audio (ffmpeg 1.1)
+* player:
+  - implement missing "idle" events on output errors


 ver 0.17.3 (2013/01/06)

--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -326,6 +326,8 @@ player_open_output(struct player *player)
 		pc->state = PLAYER_STATE_PAUSE;
 		player_unlock(pc);

+		idle_add(IDLE_PLAYER);
+
 		return false;
 	}
 }
@@ -800,6 +802,8 @@ play_next_chunk(struct player *player)

 		player_unlock(pc);

+		idle_add(IDLE_PLAYER);
+
 		return false;
 	}

@@ -845,13 +849,17 @@ player_song_border(struct player *player)
 	struct player_control *const pc = player->pc;
 	player_lock(pc);

-	if (pc->border_pause) {
+	const bool border_pause = pc->border_pause;
+	if (border_pause) {
 		player->paused = true;
 		pc->state = PLAYER_STATE_PAUSE;
 	}

 	player_unlock(pc);

+	if (border_pause)
+		idle_add(IDLE_PLAYER);
+
 	return true;
 }