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

[player] Stop using outputs_authorize() so it can be removed

Browse Source 
Use outputs_device_authorize() instead
This commit is contained in:
ejurgensen 2020-05-26 23:20:29 +02:00
parent d18e49f59b
commit 3cca778419
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/player.c
View File

@ -1434,8 +1434,23 @@ static enum command_state
device_auth_kickoff(void *arg, int *retval) device_auth_kickoff(void *arg, int *retval)
{ {
union player_arg *cmdarg = arg; union player_arg *cmdarg = arg;
struct output_device *device;
outputs_authorize(cmdarg->auth.type, cmdarg->auth.pin); // First find the device requiring verification
for (device = output_device_list; device; device = device->next)
{
if (device->type == cmdarg->auth.type && device->state == OUTPUT_STATE_PASSWORD)
break;
}
if (!device)
{
*retval = -1;
return COMMAND_END;
}
// We're async, so we don't care about return values or callbacks with result
outputs_device_authorize(device, cmdarg->auth.pin, NULL);
*retval = 0; *retval = 0;
return COMMAND_END; return COMMAND_END;
@ -1565,10 +1580,10 @@ device_activate_cb(struct output_device *device, enum output_device_state status
if (status == OUTPUT_STATE_PASSWORD) if (status == OUTPUT_STATE_PASSWORD)
{ {
DPRINTF(E_LOG, L_PLAYER, "The %s device '%s' requires a valid password\n", device->type_name, device->name); DPRINTF(E_LOG, L_PLAYER, "The %s device '%s' requires a valid PIN or password\n", device->type_name, device->name);
status = OUTPUT_STATE_FAILED;
retval = -2; retval = -2;
goto out;
} }
if (status == OUTPUT_STATE_FAILED) if (status == OUTPUT_STATE_FAILED)
@ -1580,7 +1595,8 @@ device_activate_cb(struct output_device *device, enum output_device_state status
goto out; goto out;
} }
// If we were just probing this is a no-op // If we were just probing or doing device verification this is a no-op, since
// there is no session any more
outputs_device_cb_set(device, device_streaming_cb); outputs_device_cb_set(device, device_streaming_cb);
out: out:
@ -3433,8 +3449,11 @@ player_device_remove(void *device)
return ret; return ret;
} }
static void
player_device_auth_kickoff(enum output_types type, char **arglist) /* ----------------------- Thread: filescanner/httpd ------------------------ */
void
player_raop_verification_kickoff(char **arglist)
{ {
union player_arg *cmdarg; union player_arg *cmdarg;
@ -3445,19 +3464,11 @@ player_device_auth_kickoff(enum output_types type, char **arglist)
return; return;
} }
cmdarg->auth.type = type; cmdarg->auth.type = OUTPUT_TYPE_RAOP;
memcpy(cmdarg->auth.pin, arglist[0], 4); memcpy(cmdarg->auth.pin, arglist[0], 4);
commands_exec_async(cmdbase, device_auth_kickoff, cmdarg); commands_exec_async(cmdbase, device_auth_kickoff, cmdarg);
}
/* --------------------------- Thread: filescanner -------------------------- */
void
player_raop_verification_kickoff(char **arglist)
{
player_device_auth_kickoff(OUTPUT_TYPE_RAOP, arglist);
} }