diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2007-11-16 20:02:02 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2007-11-16 20:02:02 +0000 |
commit | 1b2561b0d9cdb37ac433e81f8a014a92d714b3e8 (patch) | |
tree | 94dc740c8d03e8cb5a0535b62c88eb663f7e2bb5 /tools/voice.pl | |
parent | 42951494837fa26c7b9cce9115d0d0561238b297 (diff) | |
download | rockbox-1b2561b0d9cdb37ac433e81f8a014a92d714b3e8.tar.gz rockbox-1b2561b0d9cdb37ac433e81f8a014a92d714b3e8.zip |
Move some stuff around so things are actually initialized before using them. Last second changes are evil.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15646 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/voice.pl')
-rwxr-xr-x | tools/voice.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/voice.pl b/tools/voice.pl index 98f67337d4..22a98c1d3c 100755 --- a/tools/voice.pl +++ b/tools/voice.pl | |||
@@ -410,9 +410,6 @@ sub gentalkclips { | |||
410 | my $d = new DirHandle $dir; | 410 | my $d = new DirHandle $dir; |
411 | while (my $file = $d->read) { | 411 | while (my $file = $d->read) { |
412 | my ($voice, $wav, $mp3); | 412 | my ($voice, $wav, $mp3); |
413 | $voice = $file; | ||
414 | $wav = sprintf("%s.talk.wav", $path); | ||
415 | |||
416 | # Print some progress information | 413 | # Print some progress information |
417 | if (++$i % 10 == 0 and !$verbose) { | 414 | if (++$i % 10 == 0 and !$verbose) { |
418 | print("."); | 415 | print("."); |
@@ -420,6 +417,10 @@ sub gentalkclips { | |||
420 | 417 | ||
421 | # Convert to a complete path | 418 | # Convert to a complete path |
422 | my $path = sprintf("%s/%s", $dir, $file); | 419 | my $path = sprintf("%s/%s", $dir, $file); |
420 | |||
421 | $voice = $file; | ||
422 | $wav = sprintf("%s.talk.wav", $path); | ||
423 | |||
423 | # Ignore dot-dirs and talk files | 424 | # Ignore dot-dirs and talk files |
424 | if ($file eq '.' || $file eq '..' || $file =~ /\.talk$/) { | 425 | if ($file eq '.' || $file eq '..' || $file =~ /\.talk$/) { |
425 | next; | 426 | next; |