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
commit 214a526945
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -16,8 +16,12 @@ ver 0.18 (2012/??/??)
ver 0.17.4 (2013/??/??) ver 0.17.4 (2013/??/??)
* protocol:
- allow to omit END in ranges (START:END)
* decoder: * decoder:
- ffmpeg: support float planar audio (ffmpeg 1.1) - ffmpeg: support float planar audio (ffmpeg 1.1)
* player:
- implement missing "idle" events on output errors
ver 0.17.3 (2013/01/06) ver 0.17.3 (2013/01/06)
* output: * output:

10
src/PlayerThread.cxx
View File

@ -350,6 +350,8 @@ player_open_output(struct player *player)
pc->state = PLAYER_STATE_PAUSE; pc->state = PLAYER_STATE_PAUSE;
pc->Unlock(); pc->Unlock();
idle_add(IDLE_PLAYER);
return false; return false;
} }
} }
@ -834,6 +836,8 @@ play_next_chunk(struct player *player)
pc->Unlock(); pc->Unlock();
idle_add(IDLE_PLAYER);
return false; return false;
} }
@ -879,13 +883,17 @@ player_song_border(struct player *player)
struct player_control *const pc = player->pc; struct player_control *const pc = player->pc;
pc->Lock(); pc->Lock();
if (pc->border_pause) { const bool border_pause = pc->border_pause;
if (border_pause) {
player->paused = true; player->paused = true;
pc->state = PLAYER_STATE_PAUSE; pc->state = PLAYER_STATE_PAUSE;
} }
pc->Unlock(); pc->Unlock();
if (border_pause)
idle_add(IDLE_PLAYER);
return true; 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 == ':') { if (*test == ':') {
value = strtol(++test, &test2, 10); value = strtol(++test, &test2, 10);
if (test2 == test || *test2 != '\0') { if (*test2 != '\0') {
command_error(client, ACK_ERROR_ARG, command_error(client, ACK_ERROR_ARG,
"Integer or range expected: %s", s); "Integer or range expected: %s", s);
return false; return false;