summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-21 00:34:37 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-21 11:59:47 +0000
commit688c89cfe13658dc0c36c67235ed968e286d78bf (patch)
treed365eac0ec1211483583c6c6b8b71c4d36ab4469 /apps
parent25f9601d7bd6f98110e646d7d2b769d26b46bfca (diff)
downloadrockbox-688c89cfe13658dc0c36c67235ed968e286d78bf.tar.gz
rockbox-688c89cfe13658dc0c36c67235ed968e286d78bf.tar.bz2
rockbox-688c89cfe13658dc0c36c67235ed968e286d78bf.zip
genlang: More voice-related fixes.
* 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
Diffstat (limited to 'apps')
-rw-r--r--apps/lang/lang.make2
-rw-r--r--apps/talk.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/lang/lang.make b/apps/lang/lang.make
index b705ff9d0d..08cec5090a 100644
--- a/apps/lang/lang.make
+++ b/apps/lang/lang.make
@@ -51,7 +51,7 @@ $(BUILDDIR)/%.lng $(BUILDDIR)/%.vstrings: $(ROOTDIR)/%.lang $(BUILDDIR)/apps/gen
$(SILENT)mkdir -p $(dir $@)
$(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)rm -f $<.tmp
+ $(SILENT)rm -f $@.tmp
$(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ)
$(call PRINTS,ZIP $(subst $(BUILDDIR)/,,$@))
diff --git a/apps/talk.c b/apps/talk.c
index 2d27f7a399..d38432de7c 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -624,7 +624,7 @@ static bool load_voicefile_index(int fd)
if (voicefile.version == VOICE_VERSION &&
voicefile.target_id == TARGET_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))
return true;