MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Skip/remove unplayable tracks in queue instead of aborting

Browse Source
This commit is contained in:
ejurgensen 2017-01-29 22:07:51 +01:00
parent 0af75217e9
commit f7018dc659
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/player.c
View File

@ -1010,20 +1010,31 @@ source_switch(int nbytes)
source_close(last_rtptime + AIRTUNES_V2_PACKET_SAMPLES + BTOS(nbytes) - 1); source_close(last_rtptime + AIRTUNES_V2_PACKET_SAMPLES + BTOS(nbytes) - 1);
ps = source_next(); while ((ps = source_next()))
if (!ps)
{ {
cur_streaming = NULL; ret = source_open(ps, cur_streaming->end + 1, 0);
return 0; // End of queue if (ret < 0)
{
db_queue_delete_byitemid(ps->item_id);
continue;
}
ret = source_play();
if (ret < 0)
{
db_queue_delete_byitemid(ps->item_id);
source_close(last_rtptime + AIRTUNES_V2_PACKET_SAMPLES + BTOS(nbytes) - 1);
continue;
}
break;
} }
ret = source_open(ps, cur_streaming->end + 1, 0); if (!ps) // End of queue
if (ret < 0) {
return -1; cur_streaming = NULL;
return 0;
ret = source_play(); }
if (ret < 0)
return -1;
metadata_trigger(0); metadata_trigger(0);