devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

genlang: More voice-related fixes.

Browse source 
* Use consistent ID numbering
 * Use consistent logic for voicelist and voicebin files
 * Fix situations where English <-> English would fail in strange ways
 * Delete leftover tmpfile.
 * Off-by-one error in voice validation code
 * Off-by-one error in voicelist generation

Change-Id: Ib3cea2c6612138b1cbe614dacbe51000199cc9ad
This commit is contained in:
Solomon Peachy 2020-07-21 00:34:37 -04:00
parent 25f9601d7b
commit 688c89cfe1
3 changed files with 22 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/lang/lang.make
View file

@ -51,7 +51,7 @@ $(BUILDDIR)/%.lng $(BUILDDIR)/%.vstrings: $(ROOTDIR)/%.lang $(BUILDDIR)/apps/gen
$(SILENT)mkdir -p $(dir $@) $(SILENT)mkdir -p $(dir $@)
$(SILENT)$(TOOLSDIR)/genlang -u -e=$(APPSDIR)/lang/english.lang $< > $@.tmp $(SILENT)$(TOOLSDIR)/genlang -u -e=$(APPSDIR)/lang/english.lang $< > $@.tmp
$(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp $(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp
$(SILENT)rm -f $<.tmp $(SILENT)rm -f $@.tmp
$(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ) $(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ)
$(call PRINTS,ZIP $(subst $(BUILDDIR)/,,$@)) $(call PRINTS,ZIP $(subst $(BUILDDIR)/,,$@))

2
apps/talk.c
View file

@ -624,7 +624,7 @@ static bool load_voicefile_index(int fd)
if (voicefile.version == VOICE_VERSION && if (voicefile.version == VOICE_VERSION &&
voicefile.target_id == TARGET_ID && voicefile.target_id == TARGET_ID &&
voicefile.id1_max == TALK_FINAL_ID && voicefile.id1_max == TALK_FINAL_ID &&
voicefile.id2_max == TALK_FINAL_ID_VOICEONLY - VOICEONLY_DELIMITER) voicefile.id2_max == TALK_FINAL_ID_VOICEONLY - VOICEONLY_DELIMITER - 1)
{ {
if (load_index_table(fd, &voicefile)) if (load_index_table(fd, &voicefile))
return true; return true;

68
tools/genlang
View file

@ -794,7 +794,7 @@ elsif($binary || $binvoice) {
# loop over the target phrases # loop over the target phrases
# This loops over the strings in the translated language file order # This loops over the strings in the translated language file order
my @ids = ((0 .. ($idcount[$_]-1))); my @ids = ((0 .. ($idcount[$_]-1)));
push @ids, (0x8000 .. ($voiceid[$_]-1)); push @ids, (0x8001 .. ($voiceid[$_]-1));
for $n (@ids) { for $n (@ids) {
my $name=$idnum[$_][$n]; # get the ID my $name=$idnum[$_][$n]; # get the ID
my $dest = $dest{$name}; # get the destination phrase my $dest = $dest{$name}; # get the destination phrase
@ -829,66 +829,38 @@ elsif($voiceout) {
my @engl; my @engl;
# This loops over the strings in the translated language file order for (keys %users) {
my @ids = ((0 .. ($idcount[$users{"core"}]-1))); # loop over the target phrases
push @ids, (0x8000 .. ($voiceid[$users{"core"}]-1)); # This loops over the strings in the translated language file order
my @ids = ((0 .. ($idcount[$_]-1)));
push @ids, (0x8001 .. ($voiceid[$_]-1));
for $n (@ids) {
my $name=$idnum[$_][$n]; # get the ID
my $dest = $dest{$name}; # get the destination phrase
my $voice = $voice{$name}; # get the destination voice string
#for my $id (@ids) { if($voice) {
# print "$id\n"; $voice =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes
#} # Now, make sure we get the number from the english sort order:
$idnum = $idmap[$_]{$name};
for $i (@ids) { $engl[$idnum] = "#$idnum ($n)\nid: $name\nvoice: \"$voice\"\n";
my $name=$idnum[$users{"core"}][$i]; # get the ID
my $dest = $voice{$name}; # get the destination voice string
if($dest) {
$dest =~ s/^\"(.*)\"\s*$/$1/g; # cut off quotes
# Now, make sure we get the number from the english sort order:
$idnum = $idmap[$users{"core"}]{$name};
if(length($idnum)) {
$engl[$idnum] = $i;
#print "Input index $i output index $idnum\n";
} }
else {
# not used, mark it so
$engl[$i] = -1
}
} }
} }
for my $i (@ids) { # Print the list in the the English sort order
for (@engl) {
my $o = $engl[$i]; print $_;
if(($o < 0) || !length($o)) {
if($i < 0x8000) {
print "#$i\nid: NOT_USED_$i\nvoice: \"\"\n";
}
else {
print "#$i\nid: VOICE_NOT_USED_$i\nvoice: \"\"\n";
}
next;
}
my $name=$idnum[$users{"core"}][$o]; # get the ID
my $dest = $voice{$name}; # get the destination voice string
print "#$i ($o)\nid: $name\nvoice: $dest\n";
} }
} }
if($verbose) { if($verbose) {
my $num_str = 0; my $num_str = 0;
for (keys %users) { for (keys %users) {
$num_str += $idcount[$_]; $num_str += $idcount[$_];
} }
printf("%d ID strings scanned\n", $num_str); printf("%d ID strings scanned\n", $num_str);
print "* head *\n"; print "* head *\n";