summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2024-06-20 20:51:40 -0400
committerSolomon Peachy <pizza@shaftnet.org>2024-06-20 21:00:48 -0400
commit80cd79992540f33479f272cd4024d97e554b4220 (patch)
treed90eec2abff6bf3c36785aa58433f1cff59b8de7
parentf58c15440f977b0c49145d8bc8226679b5f888dd (diff)
downloadrockbox-80cd79992540f33479f272cd4024d97e554b4220.tar.gz
rockbox-80cd79992540f33479f272cd4024d97e554b4220.zip
voice: If $POOL is not set, use <build-dir>/voice-pool by default
It will _vastly_ speed up repeated voice builds. The voice pool directory will not be erased by a 'make clean' Change-Id: Ice58d5c5355abfa5a385dfca749f8063e2ee8622
-rwxr-xr-xtools/configure3
-rw-r--r--tools/root.make4
-rwxr-xr-xtools/voice.pl4
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/configure b/tools/configure
index 2579a38933..43f02f5643 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1078,6 +1078,9 @@ Win(6)4 crosscompile, (T)est plugins, (O)mit plugins, S(m)all C lib, Logf to Ser
1078 for thislang in `echo $voicelanguage | sed 's/,/ /g'`; do 1078 for thislang in `echo $voicelanguage | sed 's/,/ /g'`; do
1079 voiceconfig "$thislang" 1079 voiceconfig "$thislang"
1080 done 1080 done
1081 if [ -z "$POOL" ] ; then
1082 echo " \$POOL is not set, will use <builddir>/voice-pool by default"
1083 fi
1081 fi 1084 fi
1082 if [ "yes" = "$use_debug" ]; then 1085 if [ "yes" = "$use_debug" ]; then
1083 debug="-DDEBUG" 1086 debug="-DDEBUG"
diff --git a/tools/root.make b/tools/root.make
index 6e96844465..b8637dc923 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -374,6 +374,10 @@ ifdef TTS_ENGINE
374 374
375voice: voicetools $(BUILDDIR)/apps/features 375voice: voicetools $(BUILDDIR)/apps/features
376 $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ 376 $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \
377 if [ -z "$$POOL" ] ; then \
378 export POOL="$(BUILDDIR)/voice-pool" ; \
379 fi;\
380 mkdir -p $${POOL} ;\
377 for lang in `echo $(VOICELANGUAGE) |sed "s/,/ /g"`; do $(TOOLSDIR)/voice.pl -V -l=$$lang -t=$(MODELNAME)$$feat -i=$(TARGET_ID) -e="$(ENCODER)" -E="$(ENC_OPTS)" -s=$(TTS_ENGINE) -S="$(TTS_OPTS)"; done 381 for lang in `echo $(VOICELANGUAGE) |sed "s/,/ /g"`; do $(TOOLSDIR)/voice.pl -V -l=$$lang -t=$(MODELNAME)$$feat -i=$(TARGET_ID) -e="$(ENCODER)" -E="$(ENC_OPTS)" -s=$(TTS_ENGINE) -S="$(TTS_OPTS)"; done
378 382
379talkclips: voicetools 383talkclips: voicetools
diff --git a/tools/voice.pl b/tools/voice.pl
index c62e4c164a..0e58bad503 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -666,9 +666,9 @@ if ($V == 1) {
666 $SIG{INT} = \&panic_cleanup; 666 $SIG{INT} = \&panic_cleanup;
667 $SIG{KILL} = \&panic_cleanup; 667 $SIG{KILL} = \&panic_cleanup;
668 668
669 printf("Generating voice\n Target: %s\n Language: %s\n Encoder (options): %s (%s)\n TTS Engine (options): %s (%s)\n", 669 printf("Generating voice\n Target: %s\n Language: %s\n Encoder (options): %s (%s)\n TTS Engine (options): %s (%s)\n Pool directory: %s\n",
670 defined($t) ? $t : "unknown", 670 defined($t) ? $t : "unknown",
671 $l, $e, $E, $s, $S); 671 $l, $e, $E, $s, $S, defined($ENV{'POOL'}) ? $ENV{'POOL'} : "<none>");
672 generateclips($l, $t, $e, $E, $tts_object, $S, $f); 672 generateclips($l, $t, $e, $E, $tts_object, $S, $f);
673 shutdown_tts($tts_object); 673 shutdown_tts($tts_object);
674 createvoice($l, $i, $f); 674 createvoice($l, $i, $f);