MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-20 01:50:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Modifications to the playqueue-clear command:

Browse Source 
- do not stop playback when clearing the UpNext queue
- clear history, if mode=0x68697374 ("hist")
This commit is contained in:
chme
2014-05-17 14:06:50 +02:00
parent ce209bae7a
commit b7cb0da2c2
3 changed files with 127 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/player.c
View File

@@ -3588,6 +3588,50 @@ queue_clear(struct player_command *cmd)
return 0;
}
static int
queue_empty(struct player_command *cmd)
{
int clear_hist;
struct player_source *ps;
clear_hist = cmd->arg.intval;
if (clear_hist)
{
memset(history, 0, sizeof(struct player_history));
}
else
{
if (!source_head || !cur_streaming)
return 0;
// Stop playback if playing and streaming song are not the same
if (!cur_playing || cur_playing != cur_streaming)
{
playback_stop(cmd);
queue_clear(cmd);
return 0;
}
// Set head to the current playing song
shuffle_head = cur_playing;
source_head = cur_playing;
// Free all items in the queue except the current playing song
for (ps = source_head->pl_next; ps != source_head; ps = ps->pl_next)
{
source_free(ps);
}
// Make the queue circular again
source_head->pl_next = source_head;
source_head->pl_prev = source_head;
source_head->shuffle_next = source_head;
source_head->shuffle_prev = source_head;
}
return 0;
}
static int
queue_plid(struct player_command *cmd)
{
@@ -4111,6 +4155,22 @@ player_queue_clear(void)
command_deinit(&cmd);
}
void
player_queue_empty(int clear_hist)
{
struct player_command cmd;
command_init(&cmd);
cmd.func = queue_empty;
cmd.func_bh = NULL;
cmd.arg.intval = clear_hist;
sync_command(&cmd);
command_deinit(&cmd);
}
void
player_queue_plid(uint32_t plid)
{