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

* Only pass resolution details on scaled images if they are requested.

Browse Source
This commit is contained in:
Justin Maggard 2009-09-14 19:41:15 +00:00
parent bd0aabf933
commit 6d288868ca
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
upnpsoap.c
View File

@ -726,11 +726,17 @@ callback(void *args, int argc, char **argv, char **azColName)
} }
memcpy(passed_args->resp+passed_args->size, &str_buf, ret+1); memcpy(passed_args->resp+passed_args->size, &str_buf, ret+1);
passed_args->size += ret; passed_args->size += ret;
ret = sprintf(str_buf, "<res resolution=\"%dx%d\" " ret = sprintf(str_buf, "<res ");
"protocolInfo=\"http-get:*:%s:%s\">" memcpy(passed_args->resp+passed_args->size, &str_buf, ret+1);
passed_args->size += ret;
if( passed_args->filter & FILTER_RES_RESOLUTION ) {
ret = sprintf(str_buf, "resolution=\"%dx%d\" ", dstw, dsth);
memcpy(passed_args->resp+passed_args->size, &str_buf, ret+1);
passed_args->size += ret;
}
ret = sprintf(str_buf, "protocolInfo=\"http-get:*:%s:%s\">"
"http://%s:%d/Resized/%s.jpg?width=%d,height=%d" "http://%s:%d/Resized/%s.jpg?width=%d,height=%d"
"</res>", "</res>",
dstw, dsth,
mime, "DLNA.ORG_PN=JPEG_SM", lan_addr[0].str, runtime_vars.port, mime, "DLNA.ORG_PN=JPEG_SM", lan_addr[0].str, runtime_vars.port,
detailID, dstw, dsth); detailID, dstw, dsth);
} }
@ -956,7 +962,7 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
sqlite3_free(sql); sqlite3_free(sql);
if( (ret != SQLITE_OK) && (zErrMsg != NULL) ) if( (ret != SQLITE_OK) && (zErrMsg != NULL) )
{ {
DPRINTF(E_ERROR, L_HTTP, "SQL error: %s\n", zErrMsg); DPRINTF(E_WARN, L_HTTP, "SQL error: %s\nBAD SQL: %s\n", zErrMsg, sql);
sqlite3_free(zErrMsg); sqlite3_free(zErrMsg);
} }
/* Does the object even exist? */ /* Does the object even exist? */
@ -1202,7 +1208,7 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
orderBy, StartingIndex, RequestedCount); orderBy, StartingIndex, RequestedCount);
DPRINTF(E_DEBUG, L_HTTP, "Search SQL: %s\n", sql); DPRINTF(E_DEBUG, L_HTTP, "Search SQL: %s\n", sql);
ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg); ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
if( ret != SQLITE_OK ) if( (ret != SQLITE_OK) && (zErrMsg != NULL) )
{ {
DPRINTF(E_WARN, L_HTTP, "SQL error: %s\nBAD SQL: %s\n", zErrMsg, sql); DPRINTF(E_WARN, L_HTTP, "SQL error: %s\nBAD SQL: %s\n", zErrMsg, sql);
sqlite3_free(zErrMsg); sqlite3_free(zErrMsg);