[player] if source is not pausable (http-streams or pipe) abort playback

on pause command 

This restores the behaviour before the queue/player-refactoring.
This commit is contained in:
chme 2015-10-25 08:58:47 +01:00
parent 43893dff48
commit 94895b8eed
1 changed files with 11 additions and 0 deletions

View File

@ -1011,6 +1011,9 @@ stream_pause(struct player_source *ps)
switch (ps->data_kind) switch (ps->data_kind)
{ {
case DATA_KIND_HTTP: case DATA_KIND_HTTP:
ret = 0;
break;
case DATA_KIND_FILE: case DATA_KIND_FILE:
ret = 0; ret = 0;
break; break;
@ -2741,6 +2744,14 @@ playback_pause_bh(struct player_command *cmd)
{ {
int ret; int ret;
if (cur_streaming->data_kind == DATA_KIND_HTTP
|| cur_streaming->data_kind == DATA_KIND_PIPE)
{
DPRINTF(E_DBG, L_PLAYER, "Source is not pausable, abort playback\n");
playback_abort();
return -1;
}
status_update(PLAY_PAUSED); status_update(PLAY_PAUSED);
if (cur_streaming->media_kind & (MEDIA_KIND_MOVIE | MEDIA_KIND_PODCAST | MEDIA_KIND_AUDIOBOOK | MEDIA_KIND_TVSHOW)) if (cur_streaming->media_kind & (MEDIA_KIND_MOVIE | MEDIA_KIND_PODCAST | MEDIA_KIND_AUDIOBOOK | MEDIA_KIND_TVSHOW))