summaryrefslogtreecommitdiff
path: root/apps/settings_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r--apps/settings_menu.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 624274520f..4e9ec25d79 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -898,28 +898,24 @@ static bool voice_menus(void)
898 return ret; 898 return ret;
899} 899}
900 900
901/* this is used 2 times below, so it saves memory to put it in global scope */
902static const struct opt_items voice_names[] = {
903 { STR(LANG_OFF) },
904 { STR(LANG_VOICE_NUMBER) },
905 { STR(LANG_VOICE_SPELL) },
906 { STR(LANG_VOICE_DIR_HOVER) }
907};
908
901static bool voice_dirs(void) 909static bool voice_dirs(void)
902{ 910{
903 static const struct opt_items names[] = {
904 { STR(LANG_OFF) },
905 { STR(LANG_VOICE_NUMBER) },
906 { STR(LANG_VOICE_SPELL) },
907 { STR(LANG_VOICE_DIR_ENTER) },
908 { STR(LANG_VOICE_DIR_HOVER) }
909 };
910 return set_option( str(LANG_VOICE_DIR), 911 return set_option( str(LANG_VOICE_DIR),
911 &global_settings.talk_dir, INT, names, 5, NULL); 912 &global_settings.talk_dir, INT, voice_names, 4, NULL);
912} 913}
913 914
914static bool voice_files(void) 915static bool voice_files(void)
915{ 916{
916 static const struct opt_items names[] = {
917 { STR(LANG_OFF) },
918 { STR(LANG_VOICE_NUMBER) },
919 { STR(LANG_VOICE_SPELL) }
920 };
921 return set_option( str(LANG_VOICE_FILE), 917 return set_option( str(LANG_VOICE_FILE),
922 &global_settings.talk_file, INT, names, 3, NULL); 918 &global_settings.talk_file, INT, voice_names, 4, NULL);
923} 919}
924 920
925static bool voice_menu(void) 921static bool voice_menu(void)