diff options
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r-- | apps/menus/main_menu.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index b535662f13..781b6f488a 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #endif | 50 | #endif |
51 | #include "version.h" | 51 | #include "version.h" |
52 | #include "time.h" | 52 | #include "time.h" |
53 | #include "skin_engine/skin_engine.h" | 53 | #include "wps.h" |
54 | 54 | ||
55 | static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; | 55 | static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; |
56 | 56 | ||
@@ -253,17 +253,19 @@ static char* info_getname(int selected_item, void *data, | |||
253 | break; | 253 | break; |
254 | #ifdef HAVE_ALBUMART | 254 | #ifdef HAVE_ALBUMART |
255 | case INFO_ALBUMART: /* album art dimenstions */ | 255 | case INFO_ALBUMART: /* album art dimenstions */ |
256 | if (gui_sync_wps_uses_albumart()) | 256 | { |
257 | int width = 0, height = 0; | ||
258 | if (wps_uses_albumart(&width, &height)) | ||
257 | { | 259 | { |
258 | snprintf(buffer, buffer_len, "%s %dx%d", str(LANG_ALBUMART), | 260 | snprintf(buffer, buffer_len, "%s %dx%d", str(LANG_ALBUMART), |
259 | gui_wps[0].data->albumart_max_width, | 261 | width, height); |
260 | gui_wps[0].data->albumart_max_height); | ||
261 | } | 262 | } |
262 | else | 263 | else |
263 | { | 264 | { |
264 | snprintf(buffer, buffer_len, "%s %s", str(LANG_ALBUMART), | 265 | snprintf(buffer, buffer_len, "%s %s", str(LANG_ALBUMART), |
265 | str(LANG_SET_BOOL_NO)); | 266 | str(LANG_SET_BOOL_NO)); |
266 | } | 267 | } |
268 | } break; | ||
267 | #endif | 269 | #endif |
268 | } | 270 | } |
269 | return buffer; | 271 | return buffer; |
@@ -348,17 +350,20 @@ static int info_speak_item(int selected_item, void * data) | |||
348 | break; | 350 | break; |
349 | #ifdef HAVE_ALBUMART | 351 | #ifdef HAVE_ALBUMART |
350 | case INFO_ALBUMART: /* album art dimenstions */ | 352 | case INFO_ALBUMART: /* album art dimenstions */ |
351 | if (gui_sync_wps_uses_albumart()) | 353 | { |
354 | int width = 0, height = 0; | ||
355 | if (wps_uses_albumart(&width, &height)) | ||
352 | { | 356 | { |
353 | talk_id(LANG_ALBUMART, false); | 357 | talk_id(LANG_ALBUMART, false); |
354 | talk_value(gui_wps[0].data->albumart_max_width, UNIT_PIXEL, true); | 358 | talk_value(width, UNIT_PIXEL, true); |
355 | talk_value(gui_wps[0].data->albumart_max_height, UNIT_PIXEL, true); | 359 | talk_value(height, UNIT_PIXEL, true); |
356 | } | 360 | } |
357 | else | 361 | else |
358 | { | 362 | { |
359 | talk_id(LANG_ALBUMART, false); | 363 | talk_id(LANG_ALBUMART, false); |
360 | talk_id(LANG_SET_BOOL_NO, true); | 364 | talk_id(LANG_SET_BOOL_NO, true); |
361 | } | 365 | } |
366 | } break; | ||
362 | #endif | 367 | #endif |
363 | } | 368 | } |
364 | return 0; | 369 | return 0; |