MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement DACP getspeakers

This commit is contained in:
Julien BLACHE 2010-04-04 20:26:12 +02:00
parent d036fa306e
commit aa20a2e485
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/httpd_dacp.c
View File

@ -38,6 +38,7 @@
#include "httpd.h" #include "httpd.h"
#include "httpd_dacp.h" #include "httpd_dacp.h"
#include "dmap_helpers.h" #include "dmap_helpers.h"
#include "player.h"
/* From httpd_daap.c */ /* From httpd_daap.c */
@ -387,22 +388,57 @@ dacp_reply_setproperty(struct evhttp_request *req, struct evbuffer *evbuf, char
evhttp_send_reply(req, HTTP_NOCONTENT, "No Content", evbuf); evhttp_send_reply(req, HTTP_NOCONTENT, "No Content", evbuf);
} }
static void
speaker_enum_cb(uint64_t id, const char *name, int selected, int has_password, void *arg)
{
struct evbuffer *evbuf;
int len;
evbuf = (struct evbuffer *)arg;
len = 8 + strlen(name) + 16;
if (selected)
len += 9;
if (has_password)
len += 9;
dmap_add_container(evbuf, "mdcl", len); /* 8 + len */
if (selected)
dmap_add_char(evbuf, "caia", 1); /* 9 */
if (has_password)
dmap_add_char(evbuf, "cahp", 1); /* 9 */
dmap_add_string(evbuf, "minm", name); /* 8 + len */
dmap_add_long(evbuf, "msma", id); /* 16 */
}
static void static void
dacp_reply_getspeakers(struct evhttp_request *req, struct evbuffer *evbuf, char **uri, struct evkeyvalq *query) dacp_reply_getspeakers(struct evhttp_request *req, struct evbuffer *evbuf, char **uri, struct evkeyvalq *query)
{ {
struct daap_session *s; struct daap_session *s;
struct evbuffer *spklist;
s = daap_session_find(req, query, evbuf); s = daap_session_find(req, query, evbuf);
if (!s) if (!s)
return; return;
/* We're going to pretend we have local speakers... */ spklist = evbuffer_new();
dmap_add_container(evbuf, "casp", 61); /* 8 + len */ if (!spklist)
dmap_add_int(evbuf, "mstt", 200); /* 12 */ {
dmap_add_container(evbuf, "mdcl", 41); /* 8 + len */ DPRINTF(E_LOG, L_DACP, "Could not create evbuffer for speaker list\n");
dmap_add_char(evbuf, "caia", 1); /* 9 */ /* Speaker is active */
dmap_add_string(evbuf, "minm", "Computer"); /* 8 + len */ dmap_send_error(req, "casp", "Out of memory");
dmap_add_long(evbuf, "msma", 0); /* 16 */ /* Speaker identifier (ApEx mac address or 0 for computer) */
return;
}
player_speaker_enumerate(speaker_enum_cb, spklist);
dmap_add_container(evbuf, "casp", 12 + EVBUFFER_LENGTH(spklist)); /* 8 + len */
dmap_add_int(evbuf, "mstt", 200); /* 12 */
evbuffer_add_buffer(evbuf, spklist);
evbuffer_free(spklist);
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); evhttp_send_reply(req, HTTP_OK, "OK", evbuf);
} }