Changed concept for voice IDs: the voice-only IDs now are in a separate range, don't generate an empty language string. This saves memory, but requires a new voice file format with 2 tables.

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

1 files changed, 20 insertions, 3 deletions

diff --git a/tools/genlang b/tools/genlang
index de9dd43920..fd0b498813 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -62,6 +62,7 @@ while(<LANG>) {
         $set{$var} = $value;
 
         if( (($var eq "new") && $value && ($value !~ /^\"(.*)\"\W*$/)) ||
+            (($var eq "voice") && $value && ($value !~ /^\"(.*)\"\W*$/)) ||
             (($var eq "eng") && ($value !~ /^\"(.*)\"\W*$/)) ) {
             print "$input:$line:missing quotes for ".$set{'id'}."\n";
             $errors++;
@@ -75,9 +76,15 @@ while(<LANG>) {
                 # if not set, get the english version
                 $value = $set{'eng'};
             }
-
-            print HFILE "    ".$set{'id'}.",\n";
-            print CFILE "    $value,\n";
+#            print "VOICE: ".$set{'voice'}." VALUE: $value\n";
+            if(($value eq "\"\"") && $set{'voice'}) {
+                # voice-only
+                push @vfile, $set{'id'};
+            }
+            else {
+                push @hfile, $set{'id'};
+                print CFILE "    $value,\n";
+            }
 
             undef %set;
         }
@@ -87,6 +94,16 @@ while(<LANG>) {
 }
 close(LANG);
 
+for(@hfile) {
+    print HFILE "    $_,\n";
+}
+
+print HFILE "   /* --- below this follows voice-only strings --- */\n",
+    "    VOICEONLY_DELIMITER = 0x8000,\n";
+
+for(@vfile) {
+    print HFILE "    $_,\n";
+}
 
 print HFILE <<MOO
     LANG_LAST_INDEX_IN_ARRAY /* this is not a string, this is a marker */