devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#10122 - Fix wrong format type of logf functions in speex.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22857 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-09-30 12:56:33 +00:00
parent 3d1b26cddc
commit a0eadade30
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/codecs/ape.c
View file

@ -281,7 +281,7 @@ frame_start:
blockstodecode)) < 0) blockstodecode)) < 0)
{ {
/* Frame decoding error, abort */ /* Frame decoding error, abort */
LOGF("APE: Frame %d, error %d\n",currentframe,res); LOGF("APE: Frame %lu, error %d\n",currentframe,res);
retval = CODEC_ERROR; retval = CODEC_ERROR;
goto done; goto done;
} }

12
apps/codecs/speex.c
View file

@ -117,7 +117,7 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og,
begin = 0; begin = 0;
time++; time++;
} else { } else {
LOGF("Can't seek that early:%d\n",begin); LOGF("Can't seek that early:%lld\n",begin);
return -3; /* too early */ return -3; /* too early */
} }
} }
@ -156,7 +156,7 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og,
} else if (lastgranule > wantedpos) { /*too late, seek more*/ } else if (lastgranule > wantedpos) { /*too late, seek more*/
if (offset != -1) { if (offset != -1) {
LOGF("Toolate, returnanyway:%d,%d,%d,%d\n", LOGF("Toolate, returnanyway:%lld,%lld,%lld,%lld\n",
ret,lastgranule,wantedpos,avgpagelen); ret,lastgranule,wantedpos,avgpagelen);
return ret; return ret;
} }
@ -221,7 +221,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
offset = get_next_page(oy,&og,-1); offset = get_next_page(oy,&og,-1);
if (offset < 0) { /* could not find new page,use old offset */ if (offset < 0) { /* could not find new page,use old offset */
LOGF("Seek/guess/fault:%d->-<-%d,%d:%d,%d,%d\n", LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%ld,%d\n",
curpos,0,pos,offset,0, curpos,0,pos,offset,0,
ci->curpos,/*stream_length*/0); ci->curpos,/*stream_length*/0);
@ -232,7 +232,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
spx_ogg_sync_reset(oy); spx_ogg_sync_reset(oy);
} else { } else {
if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) { if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) {
LOGF("SEEK/guess/fault:%d->-<-%d,%d:%d,%d,%d\n", LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%ld,%d\n",
curpos,spx_ogg_page_granulepos(&og),pos, curpos,spx_ogg_page_granulepos(&og),pos,
offset,0,ci->curpos,/*stream_length*/0); offset,0,ci->curpos,/*stream_length*/0);
@ -287,7 +287,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
spx_ogg_sync_reset(oy); spx_ogg_sync_reset(oy);
LOGF("Seek failed:%d\n", offset); LOGF("Seek failed:%lld\n", offset);
return -1; return -1;
} }
@ -421,7 +421,7 @@ next_track:
/*seek (seeks to the page before the position) */ /*seek (seeks to the page before the position) */
if (ci->seek_time) { if (ci->seek_time) {
if(samplerate!=0&&packet_count>1){ if(samplerate!=0&&packet_count>1){
LOGF("Speex seek page:%d,%d,%d,%d\n", LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n",
((spx_int64_t)ci->seek_time/1000) * ((spx_int64_t)ci->seek_time/1000) *
(spx_int64_t)samplerate, (spx_int64_t)samplerate,
page_granule, ci->seek_time, page_granule, ci->seek_time,