MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-15 16:48:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

[outputs] Remove outputs_authorize()

Browse Source 
Replaced by outputs_device_authorize()
This commit is contained in:
ejurgensen 2020-05-26 23:21:06 +02:00
parent 3cca778419
commit d6ec6afb5b
3 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/outputs.c
View File

@ -1160,16 +1160,6 @@ outputs_metadata_purge(void)
} }
} }
void
outputs_authorize(enum output_types type, const char *pin)
{
if (outputs[type]->disabled)
return;
if (outputs[type]->authorize)
outputs[type]->authorize(pin);
}
int int
outputs_priority(struct output_device *device) outputs_priority(struct output_device *device)
{ {

6
src/outputs.h
View File

@ -238,9 +238,6 @@ struct output_definition
// Write stream data to the output devices // Write stream data to the output devices
void (*write)(struct output_buffer *buffer); void (*write)(struct output_buffer *buffer);
// Authorize an output with a pin-code (probably coming from the filescanner)
void (*authorize)(const char *pin);
// Called from worker thread for async preparation of metadata (e.g. getting // Called from worker thread for async preparation of metadata (e.g. getting
// artwork, which might involce downloading image data). The prepared data is // artwork, which might involce downloading image data). The prepared data is
// saved to metadata->data, which metadata_send() can use. // saved to metadata->data, which metadata_send() can use.
@ -358,9 +355,6 @@ outputs_metadata_send(uint32_t item_id, bool startup, output_metadata_finalize_c
void void
outputs_metadata_purge(void); outputs_metadata_purge(void);
void
outputs_authorize(enum output_types type, const char *pin);
int int
outputs_priority(struct output_device *device); outputs_priority(struct output_device *device);

21
src/outputs/raop.c
View File

@ -4382,26 +4382,6 @@ raop_verification_setup(struct raop_session *rs, const char *pin)
return -1; return -1;
} }
static void
raop_authorize(const char *pin)
{
struct raop_session *rs;
for (rs = raop_sessions; rs; rs = rs->next)
{
if (rs->state == RAOP_STATE_UNVERIFIED)
break;
}
if (!rs)
{
DPRINTF(E_LOG, L_RAOP, "Got a PIN for device verification, but no device is awaiting verification\n");
return;
}
raop_verification_setup(rs, pin);
}
static int static int
raop_device_authorize(struct output_device *device, const char *pin, int callback_id) raop_device_authorize(struct output_device *device, const char *pin, int callback_id)
{ {
@ -5046,6 +5026,5 @@ struct output_definition output_raop =
.metadata_purge = raop_metadata_purge, .metadata_purge = raop_metadata_purge,
#ifdef RAOP_VERIFICATION #ifdef RAOP_VERIFICATION
.device_authorize = raop_device_authorize, .device_authorize = raop_device_authorize,
.authorize = raop_authorize,
#endif #endif
}; };