MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 16:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

[mpd] rework listener events to use a bit map

Browse Source
This commit is contained in:
chme 2015-05-18 20:12:18 +02:00
parent baffe49887
commit 41a08d1931
4 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/httpd_dacp.c
View File

@ -2428,7 +2428,7 @@ dacp_init(void)
event_base_set(evbase_httpd, &updateev); event_base_set(evbase_httpd, &updateev);
event_add(&updateev, NULL); event_add(&updateev, NULL);
listener_add(dacp_playstatus_update_handler); listener_add(dacp_playstatus_update_handler, LISTENER_PLAYER);
return 0; return 0;

7
src/listener.c
View File

@ -27,18 +27,20 @@
struct listener struct listener
{ {
notify notify_cb; notify notify_cb;
short events;
struct listener *next; struct listener *next;
}; };
struct listener *listener_list = NULL; struct listener *listener_list = NULL;
int int
listener_add(notify notify_cb) listener_add(notify notify_cb, short events)
{ {
struct listener *listener; struct listener *listener;
listener = (struct listener*)malloc(sizeof(struct listener)); listener = (struct listener*)malloc(sizeof(struct listener));
listener->notify_cb = notify_cb; listener->notify_cb = notify_cb;
listener->events = events;
listener->next = listener_list; listener->next = listener_list;
listener_list = listener; listener_list = listener;
@ -82,7 +84,8 @@ listener_notify(enum listener_event_type type)
listener = listener_list; listener = listener_list;
while (listener) while (listener)
{ {
listener->notify_cb(type); if (type & listener->events)
listener->notify_cb(type);
listener = listener->next; listener = listener->next;
} }

15
src/listener.h
View File

@ -4,19 +4,18 @@
enum listener_event_type enum listener_event_type
{ {
LISTENER_NONE = 0, LISTENER_PLAYER = (1 << 0),
LISTENER_DATABASE, LISTENER_PLAYLIST = (1 << 1),
LISTENER_PLAYER, LISTENER_VOLUME = (1 << 2),
LISTENER_PLAYLIST, LISTENER_SPEAKER = (1 << 3),
LISTENER_VOLUME, LISTENER_OPTIONS = (1 << 4),
LISTENER_SPEAKER, LISTENER_DATABASE = (1 << 5),
LISTENER_OPTIONS,
}; };
typedef void (*notify)(enum listener_event_type type); typedef void (*notify)(enum listener_event_type type);
int int
listener_add(notify notify_cb); listener_add(notify notify_cb, short events);
int int
listener_remove(notify notify_cb); listener_remove(notify notify_cb);

47
src/mpd.c
View File

@ -153,8 +153,7 @@ free_outputs(struct output *outputs)
struct idle_client struct idle_client
{ {
struct evbuffer *evbuffer; struct evbuffer *evbuffer;
enum listener_event_type *types; short events;
unsigned int types_len;
struct idle_client *next; struct idle_client *next;
}; };
@ -640,54 +639,45 @@ mpd_command_idle(struct evbuffer *evbuf, int argc, char **argv, char **errmsg)
} }
client->evbuffer = evbuf; client->evbuffer = evbuf;
client->types = NULL; client->events = 0;
client->types_len = 0;
client->next = idle_clients; client->next = idle_clients;
if (argc > 1) if (argc > 1)
{ {
client->types_len = argc - 1;
client->types = (enum listener_event_type*)malloc(client->types_len * sizeof(enum listener_event_type));
if (!client->types)
{
DPRINTF(E_LOG, L_MPD, "Out of memory for types\n");
return ACK_ERROR_UNKNOWN;
}
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if (0 == strcmp(argv[i], "database")) if (0 == strcmp(argv[i], "database"))
{ {
client->types[i - 1] = LISTENER_DATABASE; client->events |= LISTENER_DATABASE;
} }
else if (0 == strcmp(argv[i], "player")) else if (0 == strcmp(argv[i], "player"))
{ {
client->types[i - 1] = LISTENER_PLAYER; client->events |= LISTENER_PLAYER;
} }
else if (0 == strcmp(argv[i], "playlist")) else if (0 == strcmp(argv[i], "playlist"))
{ {
client->types[i - 1] = LISTENER_PLAYLIST; client->events |= LISTENER_PLAYLIST;
} }
else if (0 == strcmp(argv[i], "mixer")) else if (0 == strcmp(argv[i], "mixer"))
{ {
client->types[i - 1] = LISTENER_VOLUME; client->events |= LISTENER_VOLUME;
} }
else if (0 == strcmp(argv[i], "output")) else if (0 == strcmp(argv[i], "output"))
{ {
client->types[i - 1] = LISTENER_SPEAKER; client->events |= LISTENER_SPEAKER;
} }
else if (0 == strcmp(argv[i], "options")) else if (0 == strcmp(argv[i], "options"))
{ {
client->types[i - 1] = LISTENER_OPTIONS; client->events |= LISTENER_OPTIONS;
} }
else else
{ {
DPRINTF(E_DBG, L_MPD, "Idle command for '%s' not supported\n", argv[i]); DPRINTF(E_DBG, L_MPD, "Idle command for '%s' not supported\n", argv[i]);
client->types[i - 1] = LISTENER_NONE;
} }
} }
} }
else
client->events = LISTENER_PLAYER | LISTENER_PLAYLIST | LISTENER_VOLUME | LISTENER_SPEAKER | LISTENER_OPTIONS;
idle_clients = client; idle_clients = client;
@ -3827,20 +3817,7 @@ mpd_accept_error_cb(struct evconnlistener *listener, void *ctx)
static int static int
mpd_notify_idle_client(struct idle_client *client, enum listener_event_type type) mpd_notify_idle_client(struct idle_client *client, enum listener_event_type type)
{ {
int i; if (!(client->events & type))
int has_type;
if (client->types_len == 0)
has_type = 1;
else
has_type = 0;
for (i = 0; !has_type && (i < client->types_len); i++)
{
has_type = (client->types[i] == type);
}
if (!has_type)
{ {
DPRINTF(E_DBG, L_MPD, "Client not listening for event: %d\n", type); DPRINTF(E_DBG, L_MPD, "Client not listening for event: %d\n", type);
return 1; return 1;
@ -4095,7 +4072,7 @@ int mpd_init(void)
} }
idle_clients = NULL; idle_clients = NULL;
listener_add(mpd_listener_cb); listener_add(mpd_listener_cb, LISTENER_PLAYER | LISTENER_PLAYLIST | LISTENER_VOLUME | LISTENER_SPEAKER | LISTENER_OPTIONS);
return 0; return 0;