diff options
author | Max Kellermann <max@duempel.org> | 2013-02-19 09:24:11 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-02-19 09:24:11 +0100 |
commit | 214a526945170308c219ddae0227acea540e97dc (patch) | |
tree | fa104ad9777b6725b15b67987f09cc3d4b323b02 /src/PlayerThread.cxx | |
parent | af9917658145e0595d16c6e508b95d0eef2986d0 (diff) | |
parent | d5b756413a1ea432e8e580b27fef004223895f07 (diff) |
Merge branch 'v0.17.x'
Diffstat (limited to 'src/PlayerThread.cxx')
-rw-r--r-- | src/PlayerThread.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index ac2cb84b..599df833 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -350,6 +350,8 @@ player_open_output(struct player *player) pc->state = PLAYER_STATE_PAUSE; pc->Unlock(); + idle_add(IDLE_PLAYER); + return false; } } @@ -834,6 +836,8 @@ play_next_chunk(struct player *player) pc->Unlock(); + idle_add(IDLE_PLAYER); + return false; } @@ -879,13 +883,17 @@ player_song_border(struct player *player) struct player_control *const pc = player->pc; pc->Lock(); - if (pc->border_pause) { + const bool border_pause = pc->border_pause; + if (border_pause) { player->paused = true; pc->state = PLAYER_STATE_PAUSE; } pc->Unlock(); + if (border_pause) + idle_add(IDLE_PLAYER); + return true; } |