MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #281 from chme/fixretrun 

Fix return values in command functions
This commit is contained in:
ejurgensen 2016-08-06 12:40:18 +03:00 committed by GitHub
parent 09e35abb83 1238fe124a
commit 58f0451625
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands.c
View File

@ -65,7 +65,7 @@ command_cb_async(struct commands_base *cmdbase, struct command *cmd)
cmdstate = cmd->func(cmd->arg, &cmd->ret); cmdstate = cmd->func(cmd->arg, &cmd->ret);
// Only free arg if there are no pending events (used in worker.c) // Only free arg if there are no pending events (used in worker.c)
if (cmdstate == COMMAND_END && cmd->arg) if (cmdstate != COMMAND_PENDING && cmd->arg)
free(cmd->arg); free(cmd->arg);
free(cmd); free(cmd);
@ -84,7 +84,13 @@ command_cb_sync(struct commands_base *cmdbase, struct command *cmd)
pthread_mutex_lock(&cmd->lck); pthread_mutex_lock(&cmd->lck);
cmdstate = cmd->func(cmd->arg, &cmd->ret); cmdstate = cmd->func(cmd->arg, &cmd->ret);
if (cmdstate == COMMAND_END) if (cmdstate == COMMAND_PENDING)
{
// Command execution is waiting for pending events before returning to the caller
cmdbase->current_cmd = cmd;
cmd->pending = cmd->ret;
}
else
{ {
// Command execution finished, execute the bottom half function // Command execution finished, execute the bottom half function
if (cmd->ret == 0 && cmd->func_bh) if (cmd->ret == 0 && cmd->func_bh)
@ -98,12 +104,6 @@ command_cb_sync(struct commands_base *cmdbase, struct command *cmd)
event_add(cmdbase->command_event, NULL); event_add(cmdbase->command_event, NULL);
} }
else
{
// Command execution is waiting for pending events before returning to the caller
cmdbase->current_cmd = cmd;
cmd->pending = cmd->ret;
}
} }
/* /*

16
src/player.c
View File

@ -2346,7 +2346,8 @@ playback_start_item(union player_arg *cmdarg, int *retval, struct queue_item *qi
if (ret < 0) if (ret < 0)
{ {
playback_abort(); playback_abort();
return -1; *retval = -1;
return COMMAND_END;
} }
} }
@ -2529,7 +2530,8 @@ playback_prev_bh(void *arg, int *retval)
{ {
playback_abort(); playback_abort();
return -1; *retval = -1;
return COMMAND_END;
} }
} }
else else
@ -2936,7 +2938,10 @@ volume_setrel_speaker(void *arg, int *retval)
continue; continue;
if (!device->selected) if (!device->selected)
return 0; {
*retval = 0;
return COMMAND_END;
}
device->relvol = relvol; device->relvol = relvol;
device->volume = rel_to_vol(relvol); device->volume = rel_to_vol(relvol);
@ -3015,7 +3020,10 @@ repeat_set(void *arg, int *retval)
union player_arg *cmdarg = arg; union player_arg *cmdarg = arg;
if (cmdarg->mode == repeat) if (cmdarg->mode == repeat)
return 0; {
*retval = 0;
return COMMAND_END;
}
switch (cmdarg->mode) switch (cmdarg->mode)
{ {

3
src/spotify.c
View File

@ -1068,7 +1068,8 @@ playback_eot(void *arg, int *retval)
if (SP_ERROR_OK != err) if (SP_ERROR_OK != err)
{ {
DPRINTF(E_LOG, L_SPOTIFY, "Playback end of track failed: %s\n", fptr_sp_error_message(err)); DPRINTF(E_LOG, L_SPOTIFY, "Playback end of track failed: %s\n", fptr_sp_error_message(err));
return -1; *retval = -1;
return COMMAND_END;
} }
g_state = SPOTIFY_STATE_STOPPING; g_state = SPOTIFY_STATE_STOPPING;