summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Häggqvist <rasher@rasher.dk>2008-08-07 21:16:52 +0000
committerJonas Häggqvist <rasher@rasher.dk>2008-08-07 21:16:52 +0000
commit8eaa39b5fc234fbcbccf876ca3d43186a3ca3156 (patch)
tree6b9d3b680c52fad2c946ebd555c5ab8dbb2d6fa5
parent2ea3ebe117b08641ca14a9264ef47dfe9dc67770 (diff)
downloadrockbox-8eaa39b5fc234fbcbccf876ca3d43186a3ca3156.tar.gz
rockbox-8eaa39b5fc234fbcbccf876ca3d43186a3ca3156.zip
Silence some warnings in voice.pl by setting the encoding to UTF-8. Output on Cygwin will be wrong if using verbose mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18216 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xtools/voice.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/voice.pl b/tools/voice.pl
index cf15cc5f4a..64c96800f4 100755
--- a/tools/voice.pl
+++ b/tools/voice.pl
@@ -241,6 +241,7 @@ sub voicestring {
241 our $verbose; 241 our $verbose;
242 my ($string, $output, $tts_engine_opts, $tts_object) = @_; 242 my ($string, $output, $tts_engine_opts, $tts_object) = @_;
243 my $cmd; 243 my $cmd;
244 binmode(STDOUT, ':encoding(UTF-8)');
244 printf("Generate \"%s\" with %s in file %s\n", $string, $$tts_object{"name"}, $output) if $verbose; 245 printf("Generate \"%s\" with %s in file %s\n", $string, $$tts_object{"name"}, $output) if $verbose;
245 switch($$tts_object{"name"}) { 246 switch($$tts_object{"name"}) {
246 case "festival" { 247 case "festival" {
@@ -251,6 +252,7 @@ sub voicestring {
251 # Open command, and filehandles for STDIN, STDOUT, STDERR 252 # Open command, and filehandles for STDIN, STDOUT, STDERR
252 my $pid = open3(*CMD_IN, *CMD_OUT, *CMD_ERR, $cmd); 253 my $pid = open3(*CMD_IN, *CMD_OUT, *CMD_ERR, $cmd);
253 # Put the string to speak into STDIN and close it 254 # Put the string to speak into STDIN and close it
255 binmode(CMD_IN, ':encoding(utf8)');
254 print(CMD_IN $string); 256 print(CMD_IN $string);
255 close(CMD_IN); 257 close(CMD_IN);
256 # Read all output from festival_client (because it LIES TO US) 258 # Read all output from festival_client (because it LIES TO US)
@@ -265,10 +267,9 @@ sub voicestring {
265 `$cmd`; 267 `$cmd`;
266 } 268 }
267 case "espeak" { 269 case "espeak" {
268 # xxx: $tts_engine_opts isn't used
269 $cmd = "espeak $tts_engine_opts -w \"$output\""; 270 $cmd = "espeak $tts_engine_opts -w \"$output\"";
270 print("> $cmd\n") if $verbose; 271 print("> $cmd\n") if $verbose;
271 open(ESPEAK, "| $cmd"); 272 open(ESPEAK, "|-:encoding(utf8)", $cmd);
272 print ESPEAK $string . "\n"; 273 print ESPEAK $string . "\n";
273 close(ESPEAK); 274 close(ESPEAK);
274 } 275 }