storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflicting definition for unescape_tag().

Browse Source
This commit is contained in:
Justin Maggard 2014-01-31 15:46:48 -08:00
parent fc6b47fe6a
commit d248cd3a43
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tivo_commands.c
View File

@ -116,7 +116,7 @@ SendFormats(struct upnphttp *h, const char *sformat)
} }
static char * static char *
unescape_tag(char *tag) tivo_unescape_tag(char *tag)
{ {
modifyString(tag, "&", "&"); modifyString(tag, "&", "&");
modifyString(tag, "<", "<"); modifyString(tag, "<", "<");
@ -141,7 +141,7 @@ callback(void *args, int argc, char **argv, char **azColName)
if( strncmp(class, "item", 4) == 0 ) if( strncmp(class, "item", 4) == 0 )
{ {
int flags = 0; int flags = 0;
unescape_tag(title); tivo_unescape_tag(title);
if( strncmp(mime, "audio", 5) == 0 ) if( strncmp(mime, "audio", 5) == 0 )
{ {
flags |= FLAG_NO_PARAMS; flags |= FLAG_NO_PARAMS;
@ -208,15 +208,15 @@ callback(void *args, int argc, char **argv, char **azColName)
{ {
return 0; return 0;
} }
strcatf(str, "<Title>%s</Title>", unescape_tag(title)); strcatf(str, "<Title>%s</Title>", tivo_unescape_tag(title));
if( artist ) { if( artist ) {
strcatf(str, "<ArtistName>%s</ArtistName>", unescape_tag(artist)); strcatf(str, "<ArtistName>%s</ArtistName>", tivo_unescape_tag(artist));
} }
if( album ) { if( album ) {
strcatf(str, "<AlbumTitle>%s</AlbumTitle>", unescape_tag(album)); strcatf(str, "<AlbumTitle>%s</AlbumTitle>", tivo_unescape_tag(album));
} }
if( genre ) { if( genre ) {
strcatf(str, "<MusicGenre>%s</MusicGenre>", unescape_tag(genre)); strcatf(str, "<MusicGenre>%s</MusicGenre>", tivo_unescape_tag(genre));
} }
if( resolution ) { if( resolution ) {
char *width = strsep(&resolution, "x"); char *width = strsep(&resolution, "x");
@ -277,7 +277,7 @@ callback(void *args, int argc, char **argv, char **azColName)
"<ContentType>x-tivo-container/folder</ContentType>" "<ContentType>x-tivo-container/folder</ContentType>"
"</Content>" "</Content>"
"</Links>", "</Links>",
unescape_tag(title), count, id); tivo_unescape_tag(title), count, id);
} }
strcatf(str, "</Item>"); strcatf(str, "</Item>");