diff options
| author | Max Kellermann <max@duempel.org> | 2013-02-04 10:15:34 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-02-04 10:15:34 +0100 |
| commit | 96dc0a318afc5eba581696640a50f652cc3fc964 (patch) | |
| tree | 2a47fb284478a4b685228a1d26b105f7019466da | |
| parent | 1105e61f292fd61a6316a4b83439dbaa29c102fd (diff) | |
| download | mpd-96dc0a318afc5eba581696640a50f652cc3fc964.tar.gz mpd-96dc0a318afc5eba581696640a50f652cc3fc964.tar.xz mpd-96dc0a318afc5eba581696640a50f652cc3fc964.zip | |
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)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/player_thread.c | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -1,6 +1,8 @@ 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) diff --git a/src/player_thread.c b/src/player_thread.c index 707fb27ae..593788caf 100644 --- 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; } |