New way of defining menus and options allows to declare them static const, which saves the code to runtime-assemble them. Rockbox just got 6 KB smaller.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4931 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 2 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 4c1f8afc3b..31d9232851 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1390,7 +1390,7 @@ bool set_int(char* string,
    code. */
 
 bool set_option(char* string, void* variable, enum optiontype type,
-                struct opt_items* options, int numoptions, void (*function)(int))
+                const struct opt_items* options, int numoptions, void (*function)(int))
 {
     bool done = false;
     int button;
@@ -1416,7 +1416,7 @@ bool set_option(char* string, void* variable, enum optiontype type,
 
     while ( !done ) {
         index = type==INT ? *intvar : (int)*boolvar;
-        lcd_puts(0, 1, options[index].string);
+        lcd_puts(0, 1, P2STR(options[index].string));
         if (global_settings.talk_menu && index != oldindex)
         {
             talk_id(options[index].voice_id, false);