diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-28 21:46:45 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-28 21:46:45 +0000 |
commit | ab9fd1840b8025336081bd72fb9dbaea7b9909dd (patch) | |
tree | 4c410bffcf1a9de2ce55a59bef45e3ecfa183a62 /apps/plugins/imageviewer | |
parent | 8418a2c94a97da1d6f42f21dc348aadd1e177d77 (diff) | |
download | rockbox-ab9fd1840b8025336081bd72fb9dbaea7b9909dd.tar.gz rockbox-ab9fd1840b8025336081bd72fb9dbaea7b9909dd.zip |
plugins: use lcd_putsf/lcd_putsxyf
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27926 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/imageviewer')
-rw-r--r-- | apps/plugins/imageviewer/bmp/bmp.c | 12 | ||||
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 5 | ||||
-rw-r--r-- | apps/plugins/imageviewer/jpeg/jpeg.c | 13 | ||||
-rw-r--r-- | apps/plugins/imageviewer/png/png.c | 15 |
4 files changed, 11 insertions, 34 deletions
diff --git a/apps/plugins/imageviewer/bmp/bmp.c b/apps/plugins/imageviewer/bmp/bmp.c index 6b5c4b1759..b96577dbed 100644 --- a/apps/plugins/imageviewer/bmp/bmp.c +++ b/apps/plugins/imageviewer/bmp/bmp.c | |||
@@ -209,11 +209,8 @@ int load_image(char *filename, struct image_info *info, | |||
209 | if (!running_slideshow) | 209 | if (!running_slideshow) |
210 | { | 210 | { |
211 | rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); | 211 | rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); |
212 | rb->lcd_update(); | 212 | rb->lcd_putsf(0, 1, "loading %dx%d%s", |
213 | |||
214 | rb->snprintf(print, sizeof(print), "loading %dx%d%s", | ||
215 | bmp.width, bmp.height, ds == 1?"":"(resize on load)"); | 213 | bmp.width, bmp.height, ds == 1?"":"(resize on load)"); |
216 | rb->lcd_puts(0, 1, print); | ||
217 | rb->lcd_update(); | 214 | rb->lcd_update(); |
218 | } | 215 | } |
219 | 216 | ||
@@ -260,8 +257,7 @@ int load_image(char *filename, struct image_info *info, | |||
260 | 257 | ||
261 | if (!running_slideshow) | 258 | if (!running_slideshow) |
262 | { | 259 | { |
263 | rb->snprintf(print, sizeof(print), "image %dx%d", bmp.width, bmp.height); | 260 | rb->lcd_putsf(0, 2, "image %dx%d", bmp.width, bmp.height); |
264 | rb->lcd_puts(0, 2, print); | ||
265 | rb->lcd_update(); | 261 | rb->lcd_update(); |
266 | } | 262 | } |
267 | 263 | ||
@@ -308,9 +304,7 @@ int get_image(struct image_info *info, int ds) | |||
308 | 304 | ||
309 | if (!running_slideshow) | 305 | if (!running_slideshow) |
310 | { | 306 | { |
311 | rb->snprintf(print, sizeof(print), "resizing %d*%d", | 307 | rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height); |
312 | info->width, info->height); | ||
313 | rb->lcd_puts(0, 3, print); | ||
314 | rb->lcd_update(); | 308 | rb->lcd_update(); |
315 | } | 309 | } |
316 | 310 | ||
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index e581407290..eb1ce498a1 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -97,7 +97,6 @@ static fb_data rgb_linebuf[LCD_WIDTH]; /* Line buffer for scrolling when | |||
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | /* my memory pool (from the mp3 buffer) */ | 99 | /* my memory pool (from the mp3 buffer) */ |
100 | static char print[32]; /* use a common snprintf() buffer */ | ||
101 | /* the remaining free part of the buffer for loaded+resized images */ | 100 | /* the remaining free part of the buffer for loaded+resized images */ |
102 | static unsigned char* buf; | 101 | static unsigned char* buf; |
103 | static size_t buf_size; | 102 | static size_t buf_size; |
@@ -777,9 +776,7 @@ static int load_and_show(char* filename, struct image_info *info) | |||
777 | 776 | ||
778 | if(!running_slideshow) | 777 | if(!running_slideshow) |
779 | { | 778 | { |
780 | rb->snprintf(print, sizeof(print), "showing %dx%d", | 779 | rb->lcd_putsf(0, 3, "showing %dx%d", info->width, info->height); |
781 | info->width, info->height); | ||
782 | rb->lcd_puts(0, 3, print); | ||
783 | rb->lcd_update(); | 780 | rb->lcd_update(); |
784 | } | 781 | } |
785 | 782 | ||
diff --git a/apps/plugins/imageviewer/jpeg/jpeg.c b/apps/plugins/imageviewer/jpeg/jpeg.c index 95e493e7ee..5f69cc7f51 100644 --- a/apps/plugins/imageviewer/jpeg/jpeg.c +++ b/apps/plugins/imageviewer/jpeg/jpeg.c | |||
@@ -157,10 +157,7 @@ int load_image(char *filename, struct image_info *info, | |||
157 | if(!running_slideshow) | 157 | if(!running_slideshow) |
158 | { | 158 | { |
159 | rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); | 159 | rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1); |
160 | rb->lcd_update(); | 160 | rb->lcd_putsf(0, 1, "loading %d bytes", filesize); |
161 | |||
162 | rb->snprintf(print, sizeof(print), "loading %d bytes", filesize); | ||
163 | rb->lcd_puts(0, 1, print); | ||
164 | rb->lcd_update(); | 161 | rb->lcd_update(); |
165 | } | 162 | } |
166 | 163 | ||
@@ -195,9 +192,7 @@ int load_image(char *filename, struct image_info *info, | |||
195 | 192 | ||
196 | if(!running_slideshow) | 193 | if(!running_slideshow) |
197 | { | 194 | { |
198 | rb->snprintf(print, sizeof(print), "image %dx%d", | 195 | rb->lcd_putsf(0, 2, "image %dx%d", p_jpg->x_size, p_jpg->y_size); |
199 | p_jpg->x_size, p_jpg->y_size); | ||
200 | rb->lcd_puts(0, 2, print); | ||
201 | rb->lcd_update(); | 196 | rb->lcd_update(); |
202 | } | 197 | } |
203 | 198 | ||
@@ -269,9 +264,7 @@ int get_image(struct image_info *info, int ds) | |||
269 | 264 | ||
270 | if(!running_slideshow) | 265 | if(!running_slideshow) |
271 | { | 266 | { |
272 | rb->snprintf(print, sizeof(print), "decoding %d*%d", | 267 | rb->lcd_putsf(0, 3, "decoding %d*%d", info->width, info->height); |
273 | info->width, info->height); | ||
274 | rb->lcd_puts(0, 3, print); | ||
275 | rb->lcd_update(); | 268 | rb->lcd_update(); |
276 | } | 269 | } |
277 | 270 | ||
diff --git a/apps/plugins/imageviewer/png/png.c b/apps/plugins/imageviewer/png/png.c index 8bd1b241f3..46430607ea 100644 --- a/apps/plugins/imageviewer/png/png.c +++ b/apps/plugins/imageviewer/png/png.c | |||
@@ -1359,8 +1359,7 @@ int load_image(char *filename, struct image_info *info, | |||
1359 | 1359 | ||
1360 | } else { | 1360 | } else { |
1361 | if (!running_slideshow) { | 1361 | if (!running_slideshow) { |
1362 | rb->snprintf(print, sizeof(print), "loading %lu bytes", (unsigned long)image_size); | 1362 | rb->lcd_putsf(0, 1, "loading %zu bytes", image_size); |
1363 | rb->lcd_puts(0, 1, print); | ||
1364 | rb->lcd_update(); | 1363 | rb->lcd_update(); |
1365 | } | 1364 | } |
1366 | 1365 | ||
@@ -1388,14 +1387,10 @@ int load_image(char *filename, struct image_info *info, | |||
1388 | if (!decoder->error) { | 1387 | if (!decoder->error) { |
1389 | 1388 | ||
1390 | if (!running_slideshow) { | 1389 | if (!running_slideshow) { |
1391 | rb->snprintf(print, sizeof(print), "image %dx%d", | 1390 | rb->lcd_putsf(0, 2, "image %dx%d", |
1392 | decoder->infoPng.width, decoder->infoPng.height); | 1391 | decoder->infoPng.width, decoder->infoPng.height); |
1393 | rb->lcd_puts(0, 2, print); | 1392 | rb->lcd_putsf(0, 3, "decoding %d*%d", |
1394 | rb->lcd_update(); | ||
1395 | |||
1396 | rb->snprintf(print, sizeof(print), "decoding %d*%d", | ||
1397 | decoder->infoPng.width, decoder->infoPng.height); | 1393 | decoder->infoPng.width, decoder->infoPng.height); |
1398 | rb->lcd_puts(0, 3, print); | ||
1399 | rb->lcd_update(); | 1394 | rb->lcd_update(); |
1400 | } | 1395 | } |
1401 | 1396 | ||
@@ -1481,9 +1476,7 @@ int get_image(struct image_info *info, int ds) | |||
1481 | if (ds > 1) { | 1476 | if (ds > 1) { |
1482 | if (!running_slideshow) | 1477 | if (!running_slideshow) |
1483 | { | 1478 | { |
1484 | rb->snprintf(print, sizeof(print), "resizing %d*%d", | 1479 | rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height); |
1485 | info->width, info->height); | ||
1486 | rb->lcd_puts(0, 3, print); | ||
1487 | rb->lcd_update(); | 1480 | rb->lcd_update(); |
1488 | } | 1481 | } |
1489 | struct bitmap bmp_src, bmp_dst; | 1482 | struct bitmap bmp_src, bmp_dst; |