patch #978765 by Carsten Tschach, new option for voice filenames: every file may have an optional .talk companion, with a filename clip. While at it, I removed the "on enter" directory talking, nobody used it.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 45ea7de072..10333b15c1 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -71,7 +71,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
 
 
 
-#define CONFIG_BLOCK_VERSION 16
+#define CONFIG_BLOCK_VERSION 17
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
 
@@ -150,6 +150,7 @@ Rest of config block, only saved to disk:
 static const char off_on[] = "off,on";
 static const char off_on_ask[] = "off,on,ask";
 static const char graphic_numeric[] = "graphic,numeric";
+static const char off_number_spell_hover[] = "off,number,spell,hover";
 
 /* the part of the settings which ends up in the RTC RAM, where available 
    (those we either need early, save frequently, or without spinup) */
@@ -319,8 +320,8 @@ static const struct bit_entry hd_bits[] =
     {1, S_O(line_in), false, "line in", off_on },
 #endif
     /* voice */
-    {3, S_O(talk_dir), 0, "talk dir", "off,number,spell,enter,hover" },
-    {2, S_O(talk_file), 0, "talk file", "off,number,spell" },
+    {2, S_O(talk_dir), 0, "talk dir", off_number_spell_hover },
+    {2, S_O(talk_file), 0, "talk file", off_number_spell_hover },
     {1, S_O(talk_menu), true, "talk menu", off_on },
 
     /* If values are just added to the end, no need to bump the version. */