MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-30 09:03:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Always include sort tags in songlist

Browse Source
This commit is contained in:
Kai Elwert 2010-09-21 18:43:31 +02:00 committed by Julien BLACHE
parent 9e5015ffc8
commit bf86cf45bd
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/httpd_daap.c
View File

@ -190,15 +190,15 @@ static const struct dmap_field dmap_aslc = { "aslc", "daap.songlongcontentdescri
//static const struct dmap_field dmap_asls = { "asls", "daap.songlongsize", DMAP_TYPE_ULONG }; //static const struct dmap_field dmap_asls = { "asls", "daap.songlongsize", DMAP_TYPE_ULONG };
//static const struct dmap_field dmap_aspu = { "aspu", "daap.songpodcasturl", DMAP_TYPE_STRING }; //static const struct dmap_field dmap_aspu = { "aspu", "daap.songpodcasturl", DMAP_TYPE_STRING };
static const struct dmap_field dmap_asrv = { "asrv", "daap.songrelativevolume", DMAP_TYPE_BYTE }; static const struct dmap_field dmap_asrv = { "asrv", "daap.songrelativevolume", DMAP_TYPE_BYTE };
//static const struct dmap_field dmap_assa = { "assa", "daap.sortartist", DMAP_TYPE_STRING }; static const struct dmap_field dmap_assa = { "assa", "daap.sortartist", DMAP_TYPE_STRING };
//static const struct dmap_field dmap_assc = { "assc", "daap.sortcomposer", DMAP_TYPE_STRING }; static const struct dmap_field dmap_assc = { "assc", "daap.sortcomposer", DMAP_TYPE_STRING };
//static const struct dmap_field dmap_assl = { "assl", "daap.sortalbumartist", DMAP_TYPE_STRING }; static const struct dmap_field dmap_assl = { "assl", "daap.sortalbumartist", DMAP_TYPE_STRING };
//static const struct dmap_field dmap_assn = { "assn", "daap.sortname", DMAP_TYPE_STRING }; static const struct dmap_field dmap_assn = { "assn", "daap.sortname", DMAP_TYPE_STRING };
static const struct dmap_field dmap_assp = { "assp", "daap.songstoptime", DMAP_TYPE_UINT }; static const struct dmap_field dmap_assp = { "assp", "daap.songstoptime", DMAP_TYPE_UINT };
static const struct dmap_field dmap_assr = { "assr", "daap.songsamplerate", DMAP_TYPE_UINT }; static const struct dmap_field dmap_assr = { "assr", "daap.songsamplerate", DMAP_TYPE_UINT };
//static const struct dmap_field dmap_asss = { "asss", "daap.sortseriesname", DMAP_TYPE_STRING }; //static const struct dmap_field dmap_asss = { "asss", "daap.sortseriesname", DMAP_TYPE_STRING };
static const struct dmap_field dmap_asst = { "asst", "daap.songstarttime", DMAP_TYPE_UINT }; static const struct dmap_field dmap_asst = { "asst", "daap.songstarttime", DMAP_TYPE_UINT };
//static const struct dmap_field dmap_assu = { "assu", "daap.sortalbum", DMAP_TYPE_STRING }; static const struct dmap_field dmap_assu = { "assu", "daap.sortalbum", DMAP_TYPE_STRING };
static const struct dmap_field dmap_assz = { "assz", "daap.songsize", DMAP_TYPE_UINT }; static const struct dmap_field dmap_assz = { "assz", "daap.songsize", DMAP_TYPE_UINT };
static const struct dmap_field dmap_astc = { "astc", "daap.songtrackcount", DMAP_TYPE_USHORT }; static const struct dmap_field dmap_astc = { "astc", "daap.songtrackcount", DMAP_TYPE_USHORT };
static const struct dmap_field dmap_astm = { "astm", "daap.songtime", DMAP_TYPE_UINT }; static const struct dmap_field dmap_astm = { "astm", "daap.songtime", DMAP_TYPE_UINT };
@ -507,6 +507,17 @@ static struct dmap_field_map dmap_fields[] =
{ 0, &dmap_aeSU, { 0, &dmap_aeSU,
dbmfi_offsetof(tv_season_num), -1, -1 }, dbmfi_offsetof(tv_season_num), -1, -1 },
{ 0, &dmap_assn,
dbmfi_offsetof(title_sort), -1, -1 },
{ 0, &dmap_assa,
dbmfi_offsetof(artist_sort), -1, -1 },
{ 0, &dmap_assu,
dbmfi_offsetof(album_sort), -1, -1 },
{ 0, &dmap_assc,
dbmfi_offsetof(composer_sort), -1, -1 },
{ 0, &dmap_assl,
dbmfi_offsetof(album_artist_sort), -1, -1 },
{ 0, NULL, { 0, NULL,
-1, -1, -1 } -1, -1, -1 }
}; };
@ -1737,6 +1748,15 @@ daap_reply_songlist_generic(struct evhttp_request *req, struct evbuffer *evbuf,
DPRINTF(E_DBG, L_DAAP, "Done with meta tag %s (%s)\n", dfm->field->desc, *strval); DPRINTF(E_DBG, L_DAAP, "Done with meta tag %s (%s)\n", dfm->field->desc, *strval);
} }
/* Always include sort tags */
dmap_add_string(song, "assn", dbmfi.title_sort);
dmap_add_string(song, "assa", dbmfi.artist_sort);
dmap_add_string(song, "assu", dbmfi.album_sort);
dmap_add_string(song, "assl", dbmfi.album_artist_sort);
if (dbmfi.composer_sort)
dmap_add_string(song, "assc", dbmfi.composer_sort);
if (sort_headers) if (sort_headers)
{ {
ret = daap_sort_build(sctx, dbmfi.title); ret = daap_sort_build(sctx, dbmfi.title);