oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.17.x'

Browse Source
This commit is contained in:
Max Kellermann
2013-02-19 09:24:11 +01:00
parent af99176581 d5b756413a
commit 214a526945
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/PlayerThread.cxx
View File

@@ -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;
}

2
src/protocol/ArgParser.cxx
View File

@@ -103,7 +103,7 @@ check_range(Client *client, unsigned *value_r1, unsigned *value_r2,
if (*test == ':') {
value = strtol(++test, &test2, 10);
if (test2 == test || *test2 != '\0') {
if (*test2 != '\0') {
command_error(client, ACK_ERROR_ARG,
"Integer or range expected: %s", s);
return false;