Merge pull request #618 from pmatis/swift_pitch_rate_fix

Allow swift to change voice pitch and such with newer tags
hollie · Oct 9, 2016 · 4bce107 · 4bce107
2 parents 4f4c00f + 7af59b7
commit 4bce107
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/Voice_Text.pm b/lib/Voice_Text.pm
@@ -737,8 +737,19 @@ sub speak_text {
                     $speak_pgm_arg .= qq[ -e 'set $parms{volume_reset}'];
                 }
             }
-            elsif ( $speak_engine =~ /(theta|swift)/i ) {
-
+            elsif ( $speak_engine eq 'swift' ) {
+                #<prosody pitch='X' rate='X'>
+                my $prosodyparms;
+                $prosodyparms .= " pitch='$parms{pitch}'" if $parms{pitch};
+                $prosodyparms .= " rate='$parms{rate}'" if $parms{rate};
+                $prosodyparms .= " volume='$parms{ttsvolume}'" if $parms{ttsvolume};
+                $parms{text} = '<prosody' . $prosodyparms . '>' . $parms{text} . '</prosody>' if $prosodyparms;
+
+                $speak_pgm_arg .= ' -n '     . "'$parms{voice}'"  if $parms{voice};
+                $speak_pgm_arg .= ' -o '   . $parms{to_file}    if $parms{to_file}; # Not working yet??
+                $speak_pgm_arg .= qq[ "$parms{text}"];
+            }
+            elsif ( $speak_engine eq 'theta' ) {
                 $speak_pgm_arg .= " -S $parms{pitch}" if $parms{pitch};
                 $speak_pgm_arg .= " -r $parms{rate}"  if $parms{rate};
                 if ( $speak_engine eq 'theta' ) {