* Fix Xbox360 video thumbnail bug introduced in the last checkin.

This commit is contained in:
Justin Maggard 2010-08-28 08:07:53 +00:00
parent 0a1c3a3b17
commit 60460837f6

View File

@ -689,7 +689,7 @@ callback(void *args, int argc, char **argv, char **azColName)
if( album_art && atoi(album_art) ) if( album_art && atoi(album_art) )
{ {
/* Video and audio album art is handled differently */ /* Video and audio album art is handled differently */
if( *mime == 'v' && (passed_args->filter & FILTER_RES) && (passed_args->flags & FLAG_MS_PFS) ) { if( *mime == 'v' && (passed_args->filter & FILTER_RES) && !(passed_args->flags & FLAG_MS_PFS) ) {
ret = sprintf(str_buf, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN\">" ret = sprintf(str_buf, "<res protocolInfo=\"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN\">"
"http://%s:%d/AlbumArt/%s-%s.jpg" "http://%s:%d/AlbumArt/%s-%s.jpg"
"</res>", "</res>",
@ -917,15 +917,12 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
ObjectId = sqlite3_malloc(1); ObjectId = sqlite3_malloc(1);
goto browse_error; goto browse_error;
} }
if( !ObjectId ) if( !ObjectId && !(ObjectId = GetValueFromNameValueList(&data, "ContainerID")) )
{ {
if( !(ObjectId = GetValueFromNameValueList(&data, "ContainerID")) ) SoapError(h, 701, "No such object error");
{ if( h->reqflags & FLAG_MS_PFS )
SoapError(h, 701, "No such object error"); ObjectId = sqlite3_malloc(1);
if( h->reqflags & FLAG_MS_PFS ) goto browse_error;
ObjectId = sqlite3_malloc(1);
goto browse_error;
}
} }
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));