summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2010-05-15 01:57:32 +0000
committerJeffrey Goode <jeffg7@gmail.com>2010-05-15 01:57:32 +0000
commit6083f3dff5cfe991e32361a99518714b02256694 (patch)
treea6adf682204a5742d8a3f0f3e9d412ef950f7141
parent530c25130fb561a1260d32b756d008385d7e5a69 (diff)
downloadrockbox-6083f3dff5cfe991e32361a99518714b02256694.tar.gz
rockbox-6083f3dff5cfe991e32361a99518714b02256694.zip
Fix logf lines in codecs (type mismatches)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26038 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/aac.c2
-rw-r--r--apps/codecs/alac.c2
-rw-r--r--apps/codecs/ape.c4
-rw-r--r--apps/codecs/flac.c2
-rw-r--r--apps/codecs/shorten.c3
5 files changed, 7 insertions, 6 deletions
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index e9ff967d6c..0f38ea1145 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -247,7 +247,7 @@ next_track:
247 err = CODEC_OK; 247 err = CODEC_OK;
248 248
249done: 249done:
250 LOGF("AAC: Decoded %lu samples\n", sound_samples_done); 250 LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done);
251 251
252 if (ci->request_next_track()) 252 if (ci->request_next_track())
253 goto next_track; 253 goto next_track;
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index 1de127db28..0ac6b1ec80 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -146,7 +146,7 @@ enum codec_status codec_main(void)
146 retval = CODEC_OK; 146 retval = CODEC_OK;
147 147
148done: 148done:
149 LOGF("ALAC: Decoded %ld samples\n",samplesdone); 149 LOGF("ALAC: Decoded %lu samples\n",(unsigned long)samplesdone);
150 150
151 if (ci->request_next_track()) 151 if (ci->request_next_track())
152 goto next_track; 152 goto next_track;
diff --git a/apps/codecs/ape.c b/apps/codecs/ape.c
index ef3d94e1a3..06e8842d01 100644
--- a/apps/codecs/ape.c
+++ b/apps/codecs/ape.c
@@ -281,7 +281,7 @@ frame_start:
281 blockstodecode)) < 0) 281 blockstodecode)) < 0)
282 { 282 {
283 /* Frame decoding error, abort */ 283 /* Frame decoding error, abort */
284 LOGF("APE: Frame %lu, error %d\n",currentframe,res); 284 LOGF("APE: Frame %lu, error %d\n",(unsigned long)currentframe,res);
285 retval = CODEC_ERROR; 285 retval = CODEC_ERROR;
286 goto done; 286 goto done;
287 } 287 }
@@ -322,7 +322,7 @@ frame_start:
322 retval = CODEC_OK; 322 retval = CODEC_OK;
323 323
324done: 324done:
325 LOGF("APE: Decoded %ld samples\n",samplesdone); 325 LOGF("APE: Decoded %lu samples\n",(unsigned long)samplesdone);
326 326
327 if (ci->request_next_track()) 327 if (ci->request_next_track())
328 goto next_track; 328 goto next_track;
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index 3f2f369a88..14ddd3cb05 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -502,7 +502,7 @@ enum codec_status codec_main(void)
502 retval = CODEC_OK; 502 retval = CODEC_OK;
503 503
504done: 504done:
505 LOGF("FLAC: Decoded %ld samples\n",samplesdone); 505 LOGF("FLAC: Decoded %lu samples\n",(unsigned long)samplesdone);
506 506
507 if (ci->request_next_track()) 507 if (ci->request_next_track())
508 goto next_track; 508 goto next_track;
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index 9b5c2e2f17..ddc2f9a786 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -126,7 +126,8 @@ seek_start:
126 bytesleft, ci->yield); 126 bytesleft, ci->yield);
127 127
128 if (res == FN_ERROR) { 128 if (res == FN_ERROR) {
129 LOGF("Shorten: shorten_decode_frames error (%ld)\n", samplesdone); 129 LOGF("Shorten: shorten_decode_frames error (%lu)\n",
130 (unsigned long)samplesdone);
130 break; 131 break;
131 } else { 132 } else {
132 /* Insert decoded samples in pcmbuf */ 133 /* Insert decoded samples in pcmbuf */