summaryrefslogtreecommitdiff
path: root/apps/menus/main_menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-11-04 10:15:33 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-11-04 10:15:33 +0000
commit97857324c32f929c396814ba268e39a865a6fa42 (patch)
treeffb911b3fac2e01f95956e540807583b92e65134 /apps/menus/main_menu.c
parent72964f2571cce19524c45254d3b71639dd07def3 (diff)
downloadrockbox-97857324c32f929c396814ba268e39a865a6fa42.tar.gz
rockbox-97857324c32f929c396814ba268e39a865a6fa42.zip
RaaA: Use the host's malloc() for the skin engine.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28480 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r--apps/menus/main_menu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 1d22dba7ea..98f664eda6 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -147,7 +147,9 @@ enum infoscreenorder
147 INFO_DISK1, /* capacity or internal capacity/free on hotswap */ 147 INFO_DISK1, /* capacity or internal capacity/free on hotswap */
148 INFO_DISK2, /* free space or external capacity/free on hotswap */ 148 INFO_DISK2, /* free space or external capacity/free on hotswap */
149 INFO_BUFFER, 149 INFO_BUFFER,
150#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
150 INFO_SKIN_USAGE, /* ram usage of the skins */ 151 INFO_SKIN_USAGE, /* ram usage of the skins */
152#endif
151 INFO_VERSION, 153 INFO_VERSION,
152 INFO_COUNT 154 INFO_COUNT
153}; 155};
@@ -157,7 +159,9 @@ static const char* info_getname(int selected_item, void *data,
157{ 159{
158 struct info_data *info = (struct info_data*)data; 160 struct info_data *info = (struct info_data*)data;
159 char s1[32]; 161 char s1[32];
162#if defined(HAVE_MULTIVOLUME) || ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
160 char s2[32]; 163 char s2[32];
164#endif
161 if (info->new_data) 165 if (info->new_data)
162 { 166 {
163 fat_size(IF_MV2(0,) &info->size, &info->free); 167 fat_size(IF_MV2(0,) &info->size, &info->free);
@@ -242,12 +246,14 @@ static const char* info_getname(int selected_item, void *data,
242 snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); 246 snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1);
243#endif 247#endif
244 break; 248 break;
249#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
245 case INFO_SKIN_USAGE: 250 case INFO_SKIN_USAGE:
246 output_dyn_value(s1, sizeof s1, skin_buffer_usage(), byte_units, true); 251 output_dyn_value(s1, sizeof s1, skin_buffer_usage(), byte_units, true);
247 output_dyn_value(s2, sizeof s2, skin_buffer_usage() 252 output_dyn_value(s2, sizeof s2, skin_buffer_usage()
248 +skin_buffer_freespace(), byte_units, true); 253 +skin_buffer_freespace(), byte_units, true);
249 snprintf(buffer, buffer_len, "%s %s / %s", str(LANG_SKIN_RAM_USAGE), s1, s2); 254 snprintf(buffer, buffer_len, "%s %s / %s", str(LANG_SKIN_RAM_USAGE), s1, s2);
250 break; 255 break;
256#endif
251 } 257 }
252 return buffer; 258 return buffer;
253} 259}
@@ -328,10 +334,12 @@ static int info_speak_item(int selected_item, void * data)
328 output_dyn_value(NULL, 0, info->size, kbyte_units, true); 334 output_dyn_value(NULL, 0, info->size, kbyte_units, true);
329#endif 335#endif
330 break; 336 break;
337#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
331 case INFO_SKIN_USAGE: 338 case INFO_SKIN_USAGE:
332 talk_id(LANG_SKIN_RAM_USAGE, false); 339 talk_id(LANG_SKIN_RAM_USAGE, false);
333 output_dyn_value(NULL, 0, skin_buffer_usage(), byte_units, true); 340 output_dyn_value(NULL, 0, skin_buffer_usage(), byte_units, true);
334 break; 341 break;
342#endif
335 343
336 } 344 }
337 return 0; 345 return 0;