summaryrefslogtreecommitdiffstats
path: root/apps/menus
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-11-15 14:11:08 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-11-15 14:11:08 +0000
commit9e07ef2b0adb8fca7e5a9e516397e533653f8836 (patch)
tree0a283550421917e52ee04068b84a464976f0c4f2 /apps/menus
parent101693fd3047fb64e766580e80635a424fa25c4d (diff)
downloadrockbox-9e07ef2b0adb8fca7e5a9e516397e533653f8836.tar.gz
rockbox-9e07ef2b0adb8fca7e5a9e516397e533653f8836.tar.bz2
rockbox-9e07ef2b0adb8fca7e5a9e516397e533653f8836.zip
Use buflib for all skin engine allocations.
Massive thanks to Michael Chicoine and other testers for finding the early bugs. This removes all skin memory limitations git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30991 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r--apps/menus/main_menu.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 7f8a56e887..8053bf0cf8 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -147,9 +147,6 @@ enum infoscreenorder
INFO_DISK1, /* capacity or internal capacity/free on hotswap */
INFO_DISK2, /* free space or external capacity/free on hotswap */
INFO_BUFFER,
-#ifndef APPLICATION
- INFO_SKIN_USAGE, /* ram usage of the skins */
-#endif
INFO_VERSION,
INFO_COUNT
};
@@ -159,7 +156,7 @@ static const char* info_getname(int selected_item, void *data,
{
struct info_data *info = (struct info_data*)data;
char s1[32];
-#if defined(HAVE_MULTIVOLUME) || !defined(APPLICATION)
+#if defined(HAVE_MULTIVOLUME)
char s2[32];
#endif
if (info->new_data)
@@ -246,14 +243,6 @@ static const char* info_getname(int selected_item, void *data,
snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1);
#endif
break;
-#ifndef APPLICATION
- case INFO_SKIN_USAGE:
- output_dyn_value(s1, sizeof s1, skin_buffer_usage(), byte_units, true);
- output_dyn_value(s2, sizeof s2, skin_buffer_usage()
- +skin_buffer_freespace(), byte_units, true);
- snprintf(buffer, buffer_len, "%s %s / %s", str(LANG_SKIN_RAM_USAGE), s1, s2);
- break;
-#endif
}
return buffer;
}
@@ -334,12 +323,6 @@ static int info_speak_item(int selected_item, void * data)
output_dyn_value(NULL, 0, info->size, kbyte_units, true);
#endif
break;
-#ifndef APPLICATION
- case INFO_SKIN_USAGE:
- talk_id(LANG_SKIN_RAM_USAGE, false);
- output_dyn_value(NULL, 0, skin_buffer_usage(), byte_units, true);
- break;
-#endif
}
return 0;