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

* Fix some minor 64-bit compilation issues.

Browse Source
This commit is contained in:
Justin Maggard 2009-07-17 22:54:31 +00:00
parent 1a5e1a6de9
commit 0d069effd9
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
metadata.c
View File

@ -356,7 +356,7 @@ GetImageMetadata(const char * path, char * name)
else else
return 0; return 0;
strip_ext(name); strip_ext(name);
//DEBUG DPRINTF(E_DEBUG, L_METADATA, " * size: %d\n", size); //DEBUG DPRINTF(E_DEBUG, L_METADATA, " * size: %jd\n", size);
/* MIME hard-coded to JPEG for now, until we add PNG support */ /* MIME hard-coded to JPEG for now, until we add PNG support */
asprintf(&m.mime, "image/jpeg"); asprintf(&m.mime, "image/jpeg");
@ -474,7 +474,7 @@ no_exifdata:
sql = sqlite3_mprintf( "INSERT into DETAILS" sql = sqlite3_mprintf( "INSERT into DETAILS"
" (PATH, TITLE, SIZE, DATE, RESOLUTION, THUMBNAIL, CREATOR, DLNA_PN, MIME) " " (PATH, TITLE, SIZE, DATE, RESOLUTION, THUMBNAIL, CREATOR, DLNA_PN, MIME) "
"VALUES" "VALUES"
" (%Q, '%q', %llu, %Q, %Q, %d, %Q, %Q, %Q);", " (%Q, '%q', %jd, %Q, %Q, %d, %Q, %Q, %Q);",
path, name, size, date, m.resolution, thumb, cam, m.dlna_pn, m.mime); path, name, size, date, m.resolution, thumb, cam, m.dlna_pn, m.mime);
//DEBUG DPRINTF(E_DEBUG, L_METADATA, "SQL: %s\n", sql); //DEBUG DPRINTF(E_DEBUG, L_METADATA, "SQL: %s\n", sql);
if( sql_exec(db, sql) != SQLITE_OK ) if( sql_exec(db, sql) != SQLITE_OK )
@ -529,7 +529,7 @@ GetVideoMetadata(const char * path, char * name)
size = file.st_size; size = file.st_size;
} }
strip_ext(name); strip_ext(name);
//DEBUG DPRINTF(E_DEBUG, L_METADATA, " * size: %d\n", size); //DEBUG DPRINTF(E_DEBUG, L_METADATA, " * size: %jd\n", size);
av_register_all(); av_register_all();
if( av_open_input_file(&ctx, path, NULL, 0, NULL) != 0 ) if( av_open_input_file(&ctx, path, NULL, 0, NULL) != 0 )
@ -908,7 +908,7 @@ GetVideoMetadata(const char * path, char * name)
" (PATH, SIZE, DURATION, DATE, CHANNELS, BITRATE, SAMPLERATE, RESOLUTION," " (PATH, SIZE, DURATION, DATE, CHANNELS, BITRATE, SAMPLERATE, RESOLUTION,"
" CREATOR, TITLE, DLNA_PN, MIME, ALBUM_ART, ART_DLNA_PN) " " CREATOR, TITLE, DLNA_PN, MIME, ALBUM_ART, ART_DLNA_PN) "
"VALUES" "VALUES"
" (%Q, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, '%q', %Q, '%q', %lld, %Q);", " (%Q, %jd, %Q, %Q, %Q, %Q, %Q, %Q, %Q, '%q', %Q, '%q', %lld, %Q);",
path, size, m.duration, path, size, m.duration,
strlen(date) ? date : NULL, strlen(date) ? date : NULL,
m.channels, m.bitrate, m.frequency, m.resolution, m.channels, m.bitrate, m.frequency, m.resolution,

5
tivo_commands.c
View File

@ -203,9 +203,10 @@ int callback(void *args, int argc, char **argv, char **azColName)
passed_args->size += ret; passed_args->size += ret;
} }
if( resolution ) { if( resolution ) {
ret = sprintf(str_buf, "<SourceWidth>%.*s</SourceWidth>" char *width = strsep(&resolution, "x");
ret = sprintf(str_buf, "<SourceWidth>%s</SourceWidth>"
"<SourceHeight>%s</SourceHeight>", "<SourceHeight>%s</SourceHeight>",
(index(resolution, 'x')-resolution), resolution, (rindex(resolution, 'x')+1)); width, resolution);
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;
} }

6
upnpdescgen.c
View File

@ -534,7 +534,7 @@ static char *
genXML(char * str, int * len, int * tmplen, genXML(char * str, int * len, int * tmplen,
const struct XMLElt * p) const struct XMLElt * p)
{ {
unsigned short i, j, k; u_int16_t i, j, k;
int top; int top;
const char * eltname, *s; const char * eltname, *s;
char c; char c;
@ -602,8 +602,8 @@ genXML(char * str, int * len, int * tmplen,
k = i; k = i;
/*i = p[k].index; */ /*i = p[k].index; */
/*j = i + p[k].nchild; */ /*j = i + p[k].nchild; */
i = (unsigned)p[k].data & 0xffff; i = (unsigned long)p[k].data & 0xffff;
j = i + ((unsigned)p[k].data >> 16); j = i + ((unsigned long)p[k].data >> 16);
top++; top++;
#ifdef DESC_DEBUG #ifdef DESC_DEBUG
printf("DBG: +pile[%d]\t%d %d\n", top, i, j); printf("DBG: +pile[%d]\t%d %d\n", top, i, j);

13
upnphttp.c
View File

@ -1113,7 +1113,6 @@ SendResp_albumArt(struct upnphttp * h, char * object)
if( dash ) if( dash )
*dash = '\0'; *dash = '\0';
sprintf(sql_buf, "SELECT PATH from ALBUM_ART where ID = %s", object); sprintf(sql_buf, "SELECT PATH from ALBUM_ART where ID = %s", object);
printf("sql: %s\n", sql_buf);
sql_get_table(db, sql_buf, &result, &rows, NULL); sql_get_table(db, sql_buf, &result, &rows, NULL);
if( !rows ) if( !rows )
{ {
@ -1138,7 +1137,7 @@ printf("sql: %s\n", sql_buf);
sprintf(header, "HTTP/1.1 200 OK\r\n" sprintf(header, "HTTP/1.1 200 OK\r\n"
"Content-Type: image/jpeg\r\n" "Content-Type: image/jpeg\r\n"
"Content-Length: %lld\r\n" "Content-Length: %jd\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Date: %s\r\n" "Date: %s\r\n"
"EXT:\r\n" "EXT:\r\n"
@ -1547,16 +1546,16 @@ SendResp_dlnafile(struct upnphttp * h, char * object)
if( h->req_RangeEnd < size ) if( h->req_RangeEnd < size )
{ {
total = h->req_RangeEnd - h->req_RangeStart + 1; total = h->req_RangeEnd - h->req_RangeStart + 1;
sprintf(hdr_buf, "Content-Length: %llu\r\n" sprintf(hdr_buf, "Content-Length: %jd\r\n"
"Content-Range: bytes %lld-%lld/%llu\r\n", "Content-Range: bytes %jd-%jd/%jd\r\n",
total, h->req_RangeStart, h->req_RangeEnd, size); total, h->req_RangeStart, h->req_RangeEnd, size);
} }
else else
{ {
h->req_RangeEnd = size; h->req_RangeEnd = size;
total = size - h->req_RangeStart; total = size - h->req_RangeStart;
sprintf(hdr_buf, "Content-Length: %llu\r\n" sprintf(hdr_buf, "Content-Length: %jd\r\n"
"Content-Range: bytes %lld-%llu/%llu\r\n", "Content-Range: bytes %jd-%jd/%jd\r\n",
total, h->req_RangeStart, size-1, size); total, h->req_RangeStart, size-1, size);
} }
} }
@ -1564,7 +1563,7 @@ SendResp_dlnafile(struct upnphttp * h, char * object)
{ {
h->req_RangeEnd = size; h->req_RangeEnd = size;
total = size; total = size;
sprintf(hdr_buf, "Content-Length: %llu\r\n", total); sprintf(hdr_buf, "Content-Length: %jd\r\n", total);
} }
strcat(header, hdr_buf); strcat(header, hdr_buf);

4
upnphttp.h
View File

@ -51,8 +51,8 @@ struct upnphttp {
int req_Timeout; int req_Timeout;
const char * req_SID; /* For UNSUBSCRIBE */ const char * req_SID; /* For UNSUBSCRIBE */
int req_SIDLen; int req_SIDLen;
long long int req_RangeStart; off_t req_RangeStart;
long long int req_RangeEnd; off_t req_RangeEnd;
long int req_chunklen; long int req_chunklen;
u_int32_t reqflags; u_int32_t reqflags;
int respflags; int respflags;