diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/adx.c | 16 | ||||
-rw-r--r-- | apps/codecs/aiff.c | 2 | ||||
-rw-r--r-- | apps/codecs/libm4a/demux.c | 10 | ||||
-rw-r--r-- | apps/codecs/spc.c | 2 | ||||
-rw-r--r-- | apps/codecs/wav.c | 2 | ||||
-rw-r--r-- | apps/metadata.c | 4 | ||||
-rw-r--r-- | apps/plugins/dict.c | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 2 | ||||
-rw-r--r-- | apps/plugins/search.c | 2 | ||||
-rw-r--r-- | apps/root_menu.c | 4 |
10 files changed, 23 insertions, 23 deletions
diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c index 337e07e721..d85269f999 100644 --- a/apps/codecs/adx.c +++ b/apps/codecs/adx.c | |||
@@ -92,8 +92,8 @@ next_track: | |||
92 | 92 | ||
93 | /* useful for seeking and reporting current playback position */ | 93 | /* useful for seeking and reporting current playback position */ |
94 | avgbytespersec = ci->id3->frequency * 18 * channels / 32; | 94 | avgbytespersec = ci->id3->frequency * 18 * channels / 32; |
95 | DEBUGF("avgbytespersec=%d\n",avgbytespersec); | 95 | DEBUGF("avgbytespersec=%ld\n",avgbytespersec); |
96 | 96 | ||
97 | /* Get loop data */ | 97 | /* Get loop data */ |
98 | 98 | ||
99 | looping = 0; start_adr = 0; end_adr = 0; | 99 | looping = 0; start_adr = 0; end_adr = 0; |
@@ -146,14 +146,14 @@ next_track: | |||
146 | } | 146 | } |
147 | 147 | ||
148 | if (looping) { | 148 | if (looping) { |
149 | DEBUGF("ADX: looped, start: %x end: %x\n",start_adr,end_adr); | 149 | DEBUGF("ADX: looped, start: %lx end: %lx\n",start_adr,end_adr); |
150 | } else { | 150 | } else { |
151 | DEBUGF("ADX: not looped\n"); | 151 | DEBUGF("ADX: not looped\n"); |
152 | } | 152 | } |
153 | 153 | ||
154 | /* advance to first frame */ | 154 | /* advance to first frame */ |
155 | /*ci->seek_buffer(chanstart);*/ | 155 | /*ci->seek_buffer(chanstart);*/ |
156 | DEBUGF("ADX: first frame at %x\n",chanstart); | 156 | DEBUGF("ADX: first frame at %lx\n",chanstart); |
157 | bufoff = chanstart; | 157 | bufoff = chanstart; |
158 | 158 | ||
159 | /* setup pcm buffer format */ | 159 | /* setup pcm buffer format */ |
@@ -205,7 +205,7 @@ next_track: | |||
205 | if (ci->seek_time) { | 205 | if (ci->seek_time) { |
206 | uint32_t newpos; | 206 | uint32_t newpos; |
207 | 207 | ||
208 | DEBUGF("ADX: seek to %dms\n",ci->seek_time); | 208 | DEBUGF("ADX: seek to %ldms\n",ci->seek_time); |
209 | 209 | ||
210 | endofstream = 0; | 210 | endofstream = 0; |
211 | loop_count = 0; | 211 | loop_count = 0; |
@@ -227,7 +227,7 @@ next_track: | |||
227 | /* dance with the devil in the pale moonlight */ | 227 | /* dance with the devil in the pale moonlight */ |
228 | if ((bufoff > ci->curpos + (off_t)bufsize - channels*18) || | 228 | if ((bufoff > ci->curpos + (off_t)bufsize - channels*18) || |
229 | bufoff < ci->curpos) { | 229 | bufoff < ci->curpos) { |
230 | DEBUGF("ADX: requesting another buffer at %x size %x\n", | 230 | DEBUGF("ADX: requesting another buffer at %lx size %lx\n", |
231 | bufoff,ci->filesize-bufoff); | 231 | bufoff,ci->filesize-bufoff); |
232 | ci->seek_buffer(bufoff); | 232 | ci->seek_buffer(bufoff); |
233 | buf = ci->request_buffer(&n, ci->filesize-bufoff); | 233 | buf = ci->request_buffer(&n, ci->filesize-bufoff); |
@@ -236,13 +236,13 @@ next_track: | |||
236 | if ((off_t)bufsize < channels*18) { | 236 | if ((off_t)bufsize < channels*18) { |
237 | /* if we can't get a full frame, just request a single | 237 | /* if we can't get a full frame, just request a single |
238 | frame (should be able to fit it in the guard buffer) */ | 238 | frame (should be able to fit it in the guard buffer) */ |
239 | DEBUGF("ADX: requesting single frame at %x\n",bufoff); | 239 | DEBUGF("ADX: requesting single frame at %lx\n",bufoff); |
240 | buf = ci->request_buffer(&n, channels*18); | 240 | buf = ci->request_buffer(&n, channels*18); |
241 | bufsize=n; | 241 | bufsize=n; |
242 | DEBUGF("ADX: read size = %x\n",bufsize); | 242 | DEBUGF("ADX: read size = %x\n",bufsize); |
243 | } | 243 | } |
244 | if (!buf) { | 244 | if (!buf) { |
245 | DEBUGF("ADX: couldn't get buffer at %x size %x\n", | 245 | DEBUGF("ADX: couldn't get buffer at %lx size %lx\n", |
246 | bufoff,ci->filesize-bufoff); | 246 | bufoff,ci->filesize-bufoff); |
247 | return CODEC_ERROR; | 247 | return CODEC_ERROR; |
248 | } | 248 | } |
diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c index 7cb471c432..e154bce583 100644 --- a/apps/codecs/aiff.c +++ b/apps/codecs/aiff.c | |||
@@ -112,7 +112,7 @@ next_track: | |||
112 | sample_size = ((buf[14]<<8)|buf[15]); | 112 | sample_size = ((buf[14]<<8)|buf[15]); |
113 | /* sample_rate (don't use last 4 bytes, only integer fs) */ | 113 | /* sample_rate (don't use last 4 bytes, only integer fs) */ |
114 | if (buf[16] != 0x40) { | 114 | if (buf[16] != 0x40) { |
115 | DEBUGF("CODEC_ERROR: weird sampling rate (no @)\n", i); | 115 | DEBUGF("CODEC_ERROR: weird sampling rate (no @)\n"); |
116 | i = CODEC_ERROR; | 116 | i = CODEC_ERROR; |
117 | goto done; | 117 | goto done; |
118 | } | 118 | } |
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c index 10972f8b1f..29cbba7402 100644 --- a/apps/codecs/libm4a/demux.c +++ b/apps/codecs/libm4a/demux.c | |||
@@ -139,7 +139,7 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len) | |||
139 | temp=stream_read_int32(qtmovie->stream);//0x15000414 ???? | 139 | temp=stream_read_int32(qtmovie->stream);//0x15000414 ???? |
140 | maxBitrate = stream_read_int32(qtmovie->stream); | 140 | maxBitrate = stream_read_int32(qtmovie->stream); |
141 | avgBitrate = stream_read_int32(qtmovie->stream); | 141 | avgBitrate = stream_read_int32(qtmovie->stream); |
142 | DEBUGF("audioType=%d, maxBitrate=%d, avgBitrate=%d\n",audioType,maxBitrate,avgBitrate); | 142 | DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType,maxBitrate,avgBitrate); |
143 | 143 | ||
144 | /* get and verify DecSpecificInfoTag */ | 144 | /* get and verify DecSpecificInfoTag */ |
145 | if (stream_read_uint8(qtmovie->stream) != 0x05) | 145 | if (stream_read_uint8(qtmovie->stream) != 0x05) |
@@ -272,7 +272,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) | |||
272 | j=qtmovie->stream->ci->curpos+sub_chunk_len-8; | 272 | j=qtmovie->stream->ci->curpos+sub_chunk_len-8; |
273 | if (read_chunk_esds(qtmovie,sub_chunk_len)) { | 273 | if (read_chunk_esds(qtmovie,sub_chunk_len)) { |
274 | if (j!=qtmovie->stream->ci->curpos) { | 274 | if (j!=qtmovie->stream->ci->curpos) { |
275 | DEBUGF("curpos=%d, j=%d - Skipping %d bytes\n",qtmovie->stream->ci->curpos,j,j-qtmovie->stream->ci->curpos); | 275 | DEBUGF("curpos=%ld, j=%d - Skipping %ld bytes\n",qtmovie->stream->ci->curpos,j,j-qtmovie->stream->ci->curpos); |
276 | stream_skip(qtmovie->stream,j-qtmovie->stream->ci->curpos); | 276 | stream_skip(qtmovie->stream,j-qtmovie->stream->ci->curpos); |
277 | } | 277 | } |
278 | entry_remaining-=sub_chunk_len; | 278 | entry_remaining-=sub_chunk_len; |
@@ -281,7 +281,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) | |||
281 | return false; | 281 | return false; |
282 | } | 282 | } |
283 | 283 | ||
284 | DEBUGF("entry_remaining=%d\n",entry_remaining); | 284 | DEBUGF("entry_remaining=%ld\n",entry_remaining); |
285 | stream_skip(qtmovie->stream,entry_remaining); | 285 | stream_skip(qtmovie->stream,entry_remaining); |
286 | 286 | ||
287 | } else { | 287 | } else { |
@@ -379,7 +379,7 @@ static bool read_chunk_stsz(qtmovie_t *qtmovie, size_t chunk_len) | |||
379 | 379 | ||
380 | if (v > 0x0000ffff) | 380 | if (v > 0x0000ffff) |
381 | { | 381 | { |
382 | DEBUGF("stsz[%d] > 65 kB (%d)\n", i, v); | 382 | DEBUGF("stsz[%d] > 65 kB (%ld)\n", i, v); |
383 | return false; | 383 | return false; |
384 | } | 384 | } |
385 | 385 | ||
@@ -545,7 +545,7 @@ static bool read_chunk_minf(qtmovie_t *qtmovie, size_t chunk_len) | |||
545 | 545 | ||
546 | if ((i = stream_read_uint32(qtmovie->stream)) != 16) | 546 | if ((i = stream_read_uint32(qtmovie->stream)) != 16) |
547 | { | 547 | { |
548 | DEBUGF("unexpected size in media info: %d\n",i); | 548 | DEBUGF("unexpected size in media info: %ld\n",i); |
549 | stream_skip(qtmovie->stream, size_remaining-4); | 549 | stream_skip(qtmovie->stream, size_remaining-4); |
550 | return true; | 550 | return true; |
551 | } | 551 | } |
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c index 1cf20098fa..61376a5770 100644 --- a/apps/codecs/spc.c +++ b/apps/codecs/spc.c | |||
@@ -759,7 +759,7 @@ static int play_track( void ) | |||
759 | 759 | ||
760 | if (ci->seek_time) { | 760 | if (ci->seek_time) { |
761 | int curtime = sampleswritten*1000LL/sample_rate; | 761 | int curtime = sampleswritten*1000LL/sample_rate; |
762 | DEBUGF("seek to %d\ncurrently at %d\n",ci->seek_time,curtime); | 762 | DEBUGF("seek to %ld\ncurrently at %d\n",ci->seek_time,curtime); |
763 | if (ci->seek_time < curtime) { | 763 | if (ci->seek_time < curtime) { |
764 | DEBUGF("seek backwards = reset\n"); | 764 | DEBUGF("seek backwards = reset\n"); |
765 | ci->seek_complete(); | 765 | ci->seek_complete(); |
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c index 94099c543d..f45953a118 100644 --- a/apps/codecs/wav.c +++ b/apps/codecs/wav.c | |||
@@ -297,7 +297,7 @@ next_track: | |||
297 | /* this is not a fatal error with some formats, | 297 | /* this is not a fatal error with some formats, |
298 | * we'll see later if we can't decode it */ | 298 | * we'll see later if we can't decode it */ |
299 | DEBUGF("CODEC_WARNING: non-PCM WAVE (formattag=0x%x) " | 299 | DEBUGF("CODEC_WARNING: non-PCM WAVE (formattag=0x%x) " |
300 | "doesn't have ext. fmt descr (chunksize=%d<18).\n", | 300 | "doesn't have ext. fmt descr (chunksize=%ld<18).\n", |
301 | formattag, i); | 301 | formattag, i); |
302 | } | 302 | } |
303 | size = buf[24]|(buf[25]<<8); | 303 | size = buf[24]|(buf[25]<<8); |
diff --git a/apps/metadata.c b/apps/metadata.c index 3fee412b3d..e5c8ad6500 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -1611,13 +1611,13 @@ static bool get_mp4_metadata(int fd, struct mp3entry* id3) | |||
1611 | } | 1611 | } |
1612 | 1612 | ||
1613 | id3->bitrate = ((int64_t) id3->filesize * 8) / id3->length; | 1613 | id3->bitrate = ((int64_t) id3->filesize * 8) / id3->length; |
1614 | DEBUGF("MP4 bitrate %d, frequency %d Hz, length %d ms\n", | 1614 | DEBUGF("MP4 bitrate %d, frequency %ld Hz, length %ld ms\n", |
1615 | id3->bitrate, id3->frequency, id3->length); | 1615 | id3->bitrate, id3->frequency, id3->length); |
1616 | } | 1616 | } |
1617 | else | 1617 | else |
1618 | { | 1618 | { |
1619 | logf("MP4 metadata error"); | 1619 | logf("MP4 metadata error"); |
1620 | DEBUGF("MP4 metadata error. errno %d, length %d, frequency %d, filesize %d\n", | 1620 | DEBUGF("MP4 metadata error. errno %d, length %ld, frequency %ld, filesize %ld\n", |
1621 | errno, id3->length, id3->frequency, id3->filesize); | 1621 | errno, id3->length, id3->frequency, id3->filesize); |
1622 | return false; | 1622 | return false; |
1623 | } | 1623 | } |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 2fde18611e..82c6afc906 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -217,7 +217,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
217 | return PLUGIN_OK; | 217 | return PLUGIN_OK; |
218 | } | 218 | } |
219 | 219 | ||
220 | DEBUGF("Found %s at offset %d\n", word.word, reverse(word.offset)); | 220 | DEBUGF("Found %s at offset %ld\n", word.word, reverse(word.offset)); |
221 | 221 | ||
222 | /* now open the description file */ | 222 | /* now open the description file */ |
223 | fData = rb->open(DICT_DESC, O_RDONLY); | 223 | fData = rb->open(DICT_DESC, O_RDONLY); |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index bd0b7a5a42..96866c397d 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -830,7 +830,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
830 | /* Grab most of the buffer for the compressed video - leave some for | 830 | /* Grab most of the buffer for the compressed video - leave some for |
831 | PCM audio data and some for libmpeg2 malloc use. */ | 831 | PCM audio data and some for libmpeg2 malloc use. */ |
832 | buffer_size = audiosize - (PCMBUFFER_SIZE+AUDIOBUFFER_SIZE+LIBMPEG2BUFFER_SIZE); | 832 | buffer_size = audiosize - (PCMBUFFER_SIZE+AUDIOBUFFER_SIZE+LIBMPEG2BUFFER_SIZE); |
833 | DEBUGF("audiosize=%d, buffer_size=%d\n",audiosize,buffer_size); | 833 | DEBUGF("audiosize=%d, buffer_size=%ld\n",audiosize,buffer_size); |
834 | buffer = mpeg2_malloc(buffer_size,-1); | 834 | buffer = mpeg2_malloc(buffer_size,-1); |
835 | 835 | ||
836 | if (buffer == NULL) | 836 | if (buffer == NULL) |
diff --git a/apps/plugins/search.c b/apps/plugins/search.c index 26669f2b83..1705998607 100644 --- a/apps/plugins/search.c +++ b/apps/plugins/search.c | |||
@@ -154,7 +154,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
154 | 154 | ||
155 | rb = api; | 155 | rb = api; |
156 | 156 | ||
157 | DEBUGF("%s - %s\n", parameter, &filename[rb->strlen(filename)-4]); | 157 | DEBUGF("%s - %s\n", (char *)parameter, &filename[rb->strlen(filename)-4]); |
158 | /* Check the extension. We only allow .m3u files. */ | 158 | /* Check the extension. We only allow .m3u files. */ |
159 | if(rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u") && | 159 | if(rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u") && |
160 | rb->strcasecmp(&filename[rb->strlen(filename)-5], ".m3u8")) { | 160 | rb->strcasecmp(&filename[rb->strlen(filename)-5], ".m3u8")) { |
diff --git a/apps/root_menu.c b/apps/root_menu.c index 75846e3a6c..45a9b72451 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -219,7 +219,7 @@ static int wpsscrn(void* param) | |||
219 | } | 219 | } |
220 | else if ( global_status.resume_index != -1 ) | 220 | else if ( global_status.resume_index != -1 ) |
221 | { | 221 | { |
222 | DEBUGF("Resume index %X offset %X\n", | 222 | DEBUGF("Resume index %X offset %lX\n", |
223 | global_status.resume_index, | 223 | global_status.resume_index, |
224 | global_status.resume_offset); | 224 | global_status.resume_offset); |
225 | if (playlist_resume() != -1) | 225 | if (playlist_resume() != -1) |
@@ -229,7 +229,7 @@ static int wpsscrn(void* param) | |||
229 | ret_val = gui_wps_show(); | 229 | ret_val = gui_wps_show(); |
230 | } | 230 | } |
231 | } | 231 | } |
232 | else | 232 | else |
233 | { | 233 | { |
234 | gui_syncsplash(HZ*2, str(LANG_NOTHING_TO_RESUME)); | 234 | gui_syncsplash(HZ*2, str(LANG_NOTHING_TO_RESUME)); |
235 | } | 235 | } |