MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-29 08:33:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Turn speaker enumeration into a sync command

Browse Source
This commit is contained in:
Julien BLACHE 2010-12-02 19:51:08 +01:00
parent 418e818bee
commit ec4299e6c7
1 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/player.c
View File

@ -78,6 +78,12 @@ enum player_sync_source
struct player_command; struct player_command;
typedef int (*cmd_func)(struct player_command *cmd); typedef int (*cmd_func)(struct player_command *cmd);
struct spk_enum
{
spk_enum_cb cb;
void *arg;
};
struct player_command struct player_command
{ {
pthread_mutex_t lck; pthread_mutex_t lck;
@ -88,6 +94,7 @@ struct player_command
union { union {
void *noarg; void *noarg;
struct spk_enum *spk_enum;
struct player_status *status; struct player_status *status;
struct player_source *ps; struct player_source *ps;
player_status_handler status_handler; player_status_handler status_handler;
@ -2155,6 +2162,36 @@ playback_pause(struct player_command *cmd)
return cmd->func_bh(cmd); return cmd->func_bh(cmd);
} }
static int
speaker_enumerate(struct player_command *cmd)
{
struct raop_device *rd;
struct spk_enum *spk_enum;
char *laudio_name;
spk_enum = cmd->arg.spk_enum;
laudio_name = cfg_getstr(cfg_getsec(cfg, "audio"), "nickname");
pthread_mutex_lock(&dev_lck);
/* Auto-select local audio if there are no AirTunes devices */
if (!dev_list)
laudio_selected = 1;
spk_enum->cb(0, laudio_name, laudio_selected, 0, spk_enum->arg);
for (rd = dev_list; rd; rd = rd->next)
{
if (rd->advertised || rd->selected)
spk_enum->cb(rd->id, rd->name, rd->selected, rd->has_password, spk_enum->arg);
}
pthread_mutex_unlock(&dev_lck);
return 0;
}
static int static int
speaker_activate(struct raop_device *rd) speaker_activate(struct raop_device *rd)
{ {
@ -2791,26 +2828,21 @@ player_playback_prev(void)
void void
player_speaker_enumerate(spk_enum_cb cb, void *arg) player_speaker_enumerate(spk_enum_cb cb, void *arg)
{ {
struct raop_device *rd; struct player_command cmd;
char *laudio_name; struct spk_enum spk_enum;
laudio_name = cfg_getstr(cfg_getsec(cfg, "audio"), "nickname"); command_init(&cmd);
pthread_mutex_lock(&dev_lck); spk_enum.cb = cb;
spk_enum.arg = arg;
/* Auto-select local audio if there are no AirTunes devices */ cmd.func = speaker_enumerate;
if (!dev_list) cmd.func_bh = NULL;
laudio_selected = 1; cmd.arg.spk_enum = &spk_enum;
cb(0, laudio_name, laudio_selected, 0, arg); sync_command(&cmd);
for (rd = dev_list; rd; rd = rd->next) command_deinit(&cmd);
{
if (rd->advertised || rd->selected)
cb(rd->id, rd->name, rd->selected, rd->has_password, arg);
}
pthread_mutex_unlock(&dev_lck);
} }
int int