MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-01 18:21:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support for genre tag in dacp playqueue-edit queuefilter

Browse Source
This commit is contained in:
ejurgensen 2013-12-02 22:19:12 +01:00
parent 10e4a138a3
commit 161338752c
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/player.c
View File

@ -709,7 +709,9 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
int plid; int plid;
int idx; int idx;
int ret; int ret;
char buf[200]; int len;
char *s;
char buf[1024];
/* If query doesn't give even a single result give up */ /* If query doesn't give even a single result give up */
ret = fetch_first_query_match(query, &dbmfi); ret = fetch_first_query_match(query, &dbmfi);
@ -729,13 +731,17 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
safe_atou32(dbmfi.id, &id); safe_atou32(dbmfi.id, &id);
qp.sort = S_ALBUM; qp.sort = S_ALBUM;
qp.type = Q_ITEMS; qp.type = Q_ITEMS;
snprintf(buf, sizeof(buf), "f.album_artist = \"%s\"", db_escape_string(dbmfi.album_artist)); s = db_escape_string(dbmfi.album_artist);
if (!s)
return -1;
snprintf(buf, sizeof(buf), "f.album_artist = '%s'", s);
qp.filter = strdup(buf); qp.filter = strdup(buf);
} }
else if (queuefilter) else if (queuefilter)
{ {
safe_atou32(dbmfi.id, &id); safe_atou32(dbmfi.id, &id);
if ((strlen(queuefilter) > 6) && (strncmp(queuefilter, "album:", 6) == 0)) len = strlen(queuefilter);
if ((len > 6) && (strncmp(queuefilter, "album:", 6) == 0))
{ {
qp.type = Q_ITEMS; qp.type = Q_ITEMS;
ret = safe_atoi64(strchr(queuefilter, ':') + 1, &albumid); ret = safe_atoi64(strchr(queuefilter, ':') + 1, &albumid);
@ -748,7 +754,7 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
snprintf(buf, sizeof(buf), "f.songalbumid = %" PRIi64, albumid); snprintf(buf, sizeof(buf), "f.songalbumid = %" PRIi64, albumid);
qp.filter = strdup(buf); qp.filter = strdup(buf);
} }
else if ((strlen(queuefilter) > 9) && (strncmp(queuefilter, "playlist:", 9) == 0)) else if ((len > 9) && (strncmp(queuefilter, "playlist:", 9) == 0))
{ {
qp.type = Q_PLITEMS; qp.type = Q_PLITEMS;
ret = safe_atoi32(strchr(queuefilter, ':') + 1, &plid); ret = safe_atoi32(strchr(queuefilter, ':') + 1, &plid);
@ -761,6 +767,15 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
qp.id = plid; qp.id = plid;
qp.filter = strdup("1 = 1"); qp.filter = strdup("1 = 1");
} }
else if ((len > 6) && (strncmp(queuefilter, "genre:", 6) == 0))
{
qp.type = Q_ITEMS;
s = db_escape_string(queuefilter + 6);
if (!s)
return -1;
snprintf(buf, sizeof(buf), "f.genre = '%s'", s);
qp.filter = strdup(buf);
}
else else
{ {
DPRINTF(E_LOG, L_PLAYER, "Unknown queuefilter: %s\n", queuefilter); DPRINTF(E_LOG, L_PLAYER, "Unknown queuefilter: %s\n", queuefilter);