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

move setting query_params.sort out of generic queue make function

Browse Source
This commit is contained in:
chme 2015-05-01 10:47:48 +02:00
parent 3a495a3d48
commit 3832692929
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/player.c
View File

@ -760,7 +760,7 @@ metadata_check_icy(void)
/* Audio sources */ /* Audio sources */
/* Thread: httpd (DACP) */ /* Thread: httpd (DACP) */
static struct player_source * static struct player_source *
player_queue_make(struct query_params *qp, const char *sort) player_queue_make(struct query_params *qp)
{ {
struct db_media_file_info dbmfi; struct db_media_file_info dbmfi;
struct player_source *q_head; struct player_source *q_head;
@ -770,16 +770,6 @@ player_queue_make(struct query_params *qp, const char *sort)
uint32_t song_length; uint32_t song_length;
int ret; int ret;
if (sort)
{
if (strcmp(sort, "name") == 0)
qp->sort = S_NAME;
else if (strcmp(sort, "album") == 0)
qp->sort = S_ALBUM;
else if (strcmp(sort, "artist") == 0)
qp->sort = S_ARTIST;
}
ret = db_query_start(qp); ret = db_query_start(qp);
if (ret < 0) if (ret < 0)
{ {
@ -1039,7 +1029,17 @@ player_queue_make_daap(struct player_source **head, const char *query, const cha
qp.filter = daap_query_parse_sql(query); qp.filter = daap_query_parse_sql(query);
} }
ps = player_queue_make(&qp, sort); if (sort)
{
if (strcmp(sort, "name") == 0)
qp.sort = S_NAME;
else if (strcmp(sort, "album") == 0)
qp.sort = S_ALBUM;
else if (strcmp(sort, "artist") == 0)
qp.sort = S_ARTIST;
}
ps = player_queue_make(&qp);
if (qp.filter) if (qp.filter)
free(qp.filter); free(qp.filter);
@ -1093,7 +1093,7 @@ player_queue_make_pl(int plid, uint32_t *id)
qp.idx_type = I_NONE; qp.idx_type = I_NONE;
ps = player_queue_make(&qp, NULL); ps = player_queue_make(&qp);
if (qp.filter) if (qp.filter)
free(qp.filter); free(qp.filter);
@ -1145,7 +1145,7 @@ player_queue_make_mpd(char *path, int recursive)
DPRINTF(E_DBG, L_PLAYER, "Out of memory\n"); DPRINTF(E_DBG, L_PLAYER, "Out of memory\n");
} }
ps = player_queue_make(&qp, NULL); ps = player_queue_make(&qp);
sqlite3_free(qp.filter); sqlite3_free(qp.filter);
return ps; return ps;