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

Fix error in c897761ee3 

Changed the way it's detected if speaker id is hex or dec
This commit is contained in:
ejurgensen 2013-08-31 11:03:15 +02:00
parent c897761ee3
commit 736d19f924
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/httpd_dacp.c
View File

@ -1513,16 +1513,21 @@ dacp_reply_setspeakers(struct evhttp_request *req, struct evbuffer *evbuf, char
{
param++;
/* Hyperfine Remote for Android will send in decimal, others use hex */
if (safe_atou64(param, &ids[i]) < 0)
{
ret = safe_hextou64(param, &ids[i]);
if (ret < 0)
{
DPRINTF(E_LOG, L_DACP, "Invalid speaker id in request: %s\n", param);
if ((strlen(param) > 1) && (param[1] != 'x'))
ret = safe_atou64(param, &ids[i]);
else
ret = safe_hextou64(param, &ids[i]);
nspk--;
continue;
}
if (ret < 0)
{
DPRINTF(E_LOG, L_DACP, "Invalid speaker id in request: %s\n", param);
nspk--;
continue;
}
else
{
DPRINTF(E_DBG, L_DACP, "Speaker id converted with ret %d, param %s, dec val %llu.\n", ret, param, ids[i]);
}
i++;
}