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

voice: More fixes, and add more languages

Browse source 
* Pass strings via stdin where possible
 * Add German, Italian, and Norweigan to the build list.
   (in other words, everything with >=95% coverage)

Change-Id: I0154b178b15ddd0b79566c1cb62f76ade32824aa
This commit is contained in:
Solomon Peachy 2020-07-11 11:21:26 -04:00
parent aad57ea1cc
commit b546d9d172
2 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tools/builds.pm
View file

@ -526,6 +526,16 @@ sub allbuilds {
'gtts' => '-l en-gb', 'gtts' => '-l en-gb',
}, },
}, },
'deutsch' => {
'lang' => 'deutsch',
'name' => 'Deutsch (German)',
'short' => 'de',
'defengine' => 'espeak',
'engines' => {
'espeak' => '-vde',
'gtts' => '-l de',
},
},
# Everything else in alphabetical order # Everything else in alphabetical order
'english-us' => { 'english-us' => {
'lang' => 'english-us', 'lang' => 'english-us',
@ -548,6 +558,26 @@ sub allbuilds {
'gtts' => '-l el', 'gtts' => '-l el',
}, },
}, },
'italiano' => {
'lang' => 'italiano',
'name' => 'Italiano (Italian)',
'short' => 'it',
'defengine' => 'espeak',
'engines' => {
'espeak' => '-vit',
'gtts' => '-l it',
},
},
'norsk' => {
'lang' => 'norsk',
'name' => 'Norsk (Norwegian)',
'short' => 'no',
'defengine' => 'espeak',
'engines' => {
'espeak' => '-vno',
'gtts' => '-l no',
},
},
'polski' => { 'polski' => {
'lang' => 'polski', 'lang' => 'polski',
'name' => 'Polski (Polish)', 'name' => 'Polski (Polish)',

26
tools/voice.pl
View file

@ -164,7 +164,7 @@ sub init_tts {
if (defined($gtts_lang_map{$language}) && $tts_engine_opts !~ /-l/) { if (defined($gtts_lang_map{$language}) && $tts_engine_opts !~ /-l/) {
$ret{"ttsoptions"} = "-l $gtts_lang_map{$language} "; $ret{"ttsoptions"} = "-l $gtts_lang_map{$language} ";
} }
} elsif ($tts_engine eq 'espeak') { } elsif ($tts_engine eq 'espeak' || $tts_engine eq 'espeak-ng') {
if (defined($espeak_lang_map{$language}) && $tts_engine_opts !~ /-v/) { if (defined($espeak_lang_map{$language}) && $tts_engine_opts !~ /-v/) {
$ret{"ttsoptions"} = "-v$gtts_lang_map{$language} "; $ret{"ttsoptions"} = "-v$gtts_lang_map{$language} ";
} }
@ -240,14 +240,18 @@ sub voicestring {
system($cmd); system($cmd);
} }
elsif ($name eq 'espeak') { elsif ($name eq 'espeak') {
$cmd = "espeak $tts_engine_opts -w \"$output\" \"$string\""; $cmd = "espeak $tts_engine_opts -w \"$output\" --stdin";
print("> $cmd\n") if $verbose; print("> $cmd\n") if $verbose;
system($cmd); open(RBSPEAK, "| $cmd");
print RBSPEAK $string . "\n";
close(RBSPEAK);
} }
elsif ($name eq 'espeak-ng') { elsif ($name eq 'espeak-ng') {
$cmd = "espeak-ng $tts_engine_opts -w \"$output\" \"$string\""; $cmd = "espeak-ng $tts_engine_opts -w \"$output\" --stdin";
print("> $cmd\n") if $verbose; print("> $cmd\n") if $verbose;
system($cmd); open(RBSPEAK, "| $cmd");
print RBSPEAK $string . "\n";
close(RBSPEAK);
} }
elsif ($name eq 'sapi') { elsif ($name eq 'sapi') {
print({$$tts_object{"stdin"}} "SPEAK\t$output\t$string\r\n"); print({$$tts_object{"stdin"}} "SPEAK\t$output\t$string\r\n");
@ -266,14 +270,18 @@ sub voicestring {
close(RBSPEAK); close(RBSPEAK);
} }
elsif ($name eq 'mimic') { elsif ($name eq 'mimic') {
$cmd = "mimic $tts_engine_opts -o $output -t \"$string\" "; $cmd = "mimic $tts_engine_opts -o $output";
print("> $cmd\n") if $verbose; print("> $cmd\n") if $verbose;
system($cmd); open(RBSPEAK, "| $cmd");
print RBSPEAK $string . "\n";
close(RBSPEAK);
} }
elsif ($name eq 'gtts') { elsif ($name eq 'gtts') {
$cmd = "gtts-cli $tts_engine_opts -o $output \"$string\""; $cmd = "gtts-cli $tts_engine_opts -o $output -";
print("> $cmd\n") if $verbose; print("> $cmd\n") if $verbose;
system($cmd); open(RBSPEAK, "| $cmd");
print RBSPEAK $string . "\n";
close(RBSPEAK);
} }
} }