diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-09-23 11:20:08 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-09-23 11:20:08 +0000 |
commit | d34ab4af8afd6a44107898696cb833f3f09223f7 (patch) | |
tree | cbfd47c0b33e74e16debe761120926287da6e7ad | |
parent | 468edbbc7c1ea4b5de0036a732fac4ef0bee23ba (diff) | |
download | rockbox-d34ab4af8afd6a44107898696cb833f3f09223f7.tar.gz rockbox-d34ab4af8afd6a44107898696cb833f3f09223f7.zip |
Display the expected album art size in the info screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18576 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/features.txt | 4 | ||||
-rw-r--r-- | apps/lang/english.lang | 17 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 32 |
3 files changed, 53 insertions, 0 deletions
diff --git a/apps/features.txt b/apps/features.txt index e26938e02f..2aa6035388 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -12,6 +12,10 @@ agc | |||
12 | alarm | 12 | alarm |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #if defined(HAVE_ALBUMART) | ||
16 | albumart | ||
17 | #endif | ||
18 | |||
15 | #if defined(HAVE_BACKLIGHT_BRIGHTNESS) | 19 | #if defined(HAVE_BACKLIGHT_BRIGHTNESS) |
16 | backlight_brightness | 20 | backlight_brightness |
17 | #endif | 21 | #endif |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index ea232df169..8fcda35ed0 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -12037,3 +12037,20 @@ | |||
12037 | recording: "" | 12037 | recording: "" |
12038 | </voice> | 12038 | </voice> |
12039 | </phrase> | 12039 | </phrase> |
12040 | <phrase> | ||
12041 | id: LANG_ALBUMART | ||
12042 | desc: Display the expected AA size | ||
12043 | user: | ||
12044 | <source> | ||
12045 | *: none | ||
12046 | albumart: "Album Art:" | ||
12047 | </source> | ||
12048 | <dest> | ||
12049 | *: none | ||
12050 | albumart: "Album Art:" | ||
12051 | </dest> | ||
12052 | <voice> | ||
12053 | *: none | ||
12054 | albumart: "" | ||
12055 | </voice> | ||
12056 | </phrase> | ||
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 2ceed216a2..aa993ecdc0 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #endif | 49 | #endif |
50 | #include "version.h" | 50 | #include "version.h" |
51 | #include "time.h" | 51 | #include "time.h" |
52 | #include "gwps.h" | ||
52 | 53 | ||
53 | static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; | 54 | static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; |
54 | 55 | ||
@@ -142,6 +143,9 @@ enum infoscreenorder | |||
142 | INFO_DISK1, /* capacity or internal capacity/free on hotswap */ | 143 | INFO_DISK1, /* capacity or internal capacity/free on hotswap */ |
143 | INFO_DISK2, /* free space or external capacity/free on hotswap */ | 144 | INFO_DISK2, /* free space or external capacity/free on hotswap */ |
144 | INFO_BUFFER, | 145 | INFO_BUFFER, |
146 | #ifdef HAVE_ALBUMART | ||
147 | INFO_ALBUMART, | ||
148 | #endif | ||
145 | INFO_VERSION, | 149 | INFO_VERSION, |
146 | #if CONFIG_RTC | 150 | #if CONFIG_RTC |
147 | INFO_DATE, | 151 | INFO_DATE, |
@@ -279,6 +283,20 @@ static char* info_getname(int selected_item, void *data, | |||
279 | snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); | 283 | snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); |
280 | #endif | 284 | #endif |
281 | break; | 285 | break; |
286 | #ifdef HAVE_ALBUMART | ||
287 | case INFO_ALBUMART: /* album art dimenstions */ | ||
288 | if (gui_sync_wps_uses_albumart()) | ||
289 | { | ||
290 | snprintf(buffer, buffer_len, "%s %dx%d", str(LANG_ALBUMART), | ||
291 | gui_wps[0].data->albumart_max_width, | ||
292 | gui_wps[0].data->albumart_max_height); | ||
293 | } | ||
294 | else | ||
295 | { | ||
296 | snprintf(buffer, buffer_len, "%s %s", str(LANG_ALBUMART), | ||
297 | str(LANG_SET_BOOL_NO)); | ||
298 | } | ||
299 | #endif | ||
282 | } | 300 | } |
283 | return buffer; | 301 | return buffer; |
284 | } | 302 | } |
@@ -383,6 +401,20 @@ static int info_speak_item(int selected_item, void * data) | |||
383 | output_dyn_value(NULL, 0, info->size, kbyte_units, true); | 401 | output_dyn_value(NULL, 0, info->size, kbyte_units, true); |
384 | #endif | 402 | #endif |
385 | break; | 403 | break; |
404 | #ifdef HAVE_ALBUMART | ||
405 | case INFO_ALBUMART: /* album art dimenstions */ | ||
406 | if (gui_sync_wps_uses_albumart()) | ||
407 | { | ||
408 | talk_id(LANG_ALBUMART, false); | ||
409 | talk_value(gui_wps[0].data->albumart_max_width, UNIT_PIXEL, true); | ||
410 | talk_value(gui_wps[0].data->albumart_max_height, UNIT_PIXEL, true); | ||
411 | } | ||
412 | else | ||
413 | { | ||
414 | talk_id(LANG_ALBUMART, false); | ||
415 | talk_id(LANG_SET_BOOL_NO, true); | ||
416 | } | ||
417 | #endif | ||
386 | } | 418 | } |
387 | return 0; | 419 | return 0; |
388 | } | 420 | } |