Let player know about IPv6 status in RAOP

This commit is contained in:
Julien BLACHE 2011-03-15 17:55:57 +01:00
parent 2c1755f025
commit ec7c3d108c
3 changed files with 6 additions and 3 deletions

View File

@ -3720,6 +3720,7 @@ int
player_init(void) player_init(void)
{ {
uint32_t rnd; uint32_t rnd;
int raop_v6enabled;
int ret; int ret;
player_exit = 0; player_exit = 0;
@ -3832,7 +3833,7 @@ player_init(void)
goto laudio_fail; goto laudio_fail;
} }
ret = raop_init(); ret = raop_init(&raop_v6enabled);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_PLAYER, "RAOP init failed\n"); DPRINTF(E_LOG, L_PLAYER, "RAOP init failed\n");

View File

@ -3416,7 +3416,7 @@ raop_set_status_cb(struct raop_session *rs, raop_status_cb cb)
int int
raop_init(void) raop_init(int *v6enabled)
{ {
char ebuf[64]; char ebuf[64];
char *ptr; char *ptr;
@ -3515,6 +3515,8 @@ raop_init(void)
goto out_stop_timing; goto out_stop_timing;
} }
*v6enabled = !((timing_6svc.fd < 0) || (control_6svc.fd < 0));
return 0; return 0;
out_stop_timing: out_stop_timing:

View File

@ -118,7 +118,7 @@ raop_v2_write(uint8_t *buf, uint64_t rtptime);
int int
raop_init(void); raop_init(int *v6enabled);
void void
raop_deinit(void); raop_deinit(void);