From d34ab4af8afd6a44107898696cb833f3f09223f7 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 23 Sep 2008 11:20:08 +0000 Subject: [PATCH] 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 --- apps/features.txt | 4 ++++ apps/lang/english.lang | 17 +++++++++++++++++ apps/menus/main_menu.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) 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 alarm #endif +#if defined(HAVE_ALBUMART) +albumart +#endif + #if defined(HAVE_BACKLIGHT_BRIGHTNESS) backlight_brightness #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 @@ recording: "" + + id: LANG_ALBUMART + desc: Display the expected AA size + user: + + *: none + albumart: "Album Art:" + + + *: none + albumart: "Album Art:" + + + *: none + albumart: "" + + 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 @@ #endif #include "version.h" #include "time.h" +#include "gwps.h" static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; @@ -142,6 +143,9 @@ enum infoscreenorder INFO_DISK1, /* capacity or internal capacity/free on hotswap */ INFO_DISK2, /* free space or external capacity/free on hotswap */ INFO_BUFFER, +#ifdef HAVE_ALBUMART + INFO_ALBUMART, +#endif INFO_VERSION, #if CONFIG_RTC INFO_DATE, @@ -279,6 +283,20 @@ static char* info_getname(int selected_item, void *data, snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); #endif break; +#ifdef HAVE_ALBUMART + case INFO_ALBUMART: /* album art dimenstions */ + if (gui_sync_wps_uses_albumart()) + { + snprintf(buffer, buffer_len, "%s %dx%d", str(LANG_ALBUMART), + gui_wps[0].data->albumart_max_width, + gui_wps[0].data->albumart_max_height); + } + else + { + snprintf(buffer, buffer_len, "%s %s", str(LANG_ALBUMART), + str(LANG_SET_BOOL_NO)); + } +#endif } return buffer; } @@ -383,6 +401,20 @@ static int info_speak_item(int selected_item, void * data) output_dyn_value(NULL, 0, info->size, kbyte_units, true); #endif break; +#ifdef HAVE_ALBUMART + case INFO_ALBUMART: /* album art dimenstions */ + if (gui_sync_wps_uses_albumart()) + { + talk_id(LANG_ALBUMART, false); + talk_value(gui_wps[0].data->albumart_max_width, UNIT_PIXEL, true); + talk_value(gui_wps[0].data->albumart_max_height, UNIT_PIXEL, true); + } + else + { + talk_id(LANG_ALBUMART, false); + talk_id(LANG_SET_BOOL_NO, true); + } +#endif } return 0; }