[Upstage-commits] SF.net SVN: upstage:[482] branches/2.4.2/upstage/voices.py

[<aut...@us...>]

Revision: 482
          http://upstage.svn.sourceforge.net/upstage/?rev=482&view=rev
Author:   aut-upstage
Date:     2012-11-29 00:39:35 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
Scott Riddell & Gavin Chan
--------
Mbrola voices installation Attempt 1 

Modified Paths:
--------------
    branches/2.4.2/upstage/voices.py

Modified: branches/2.4.2/upstage/voices.py
===================================================================
--- branches/2.4.2/upstage/voices.py	2012-11-29 00:18:13 UTC (rev 481)
+++ branches/2.4.2/upstage/voices.py	2012-11-29 00:39:35 UTC (rev 482)
@@ -47,14 +47,15 @@
 #Heath Behrens readded the -x switch used for byte switching as it breaks some voices.
 fest_lame =    " | %s lame -S --quiet -m s -s %%s --resample 22.05 - $1 " % timeout
 rsynth_lame =  " | %s lame -S --quiet -m m -r -s 11.025 --preset phone - $1 " % timeout
-espeak_mbrola_lame = " | %s lame -S --quiet -m m -s 16  --resample 22.05 --preset phone $1.wav $1" % timeout
+espeak_mbrola_lame = " | %s lame -S --quiet -x -m m -s 16  --resample 22.05 --preset phone - $1" % timeout
+                     
 
 # espeak doesn't seem to like piping to stdout, so it saves to tmp file instead
 espeak_lame =  " %s lame -S --quiet -m m -s 22.05 --preset phone $1.wav $1 " % timeout
 espeak_cleanup = " rm $1.wav "
 
 #Heath Behrens - Need to declare to possible paths for mbrola voices.
-path_to_embrola = "/usr/local/share/mbrola/"
+path_to_embrola = "/usr/local/share/mbrola"
 #Heath Behrens - this is the path to some of the voices that install in a different location.
 #The other option is to simply copy all voices from the folder to the previous folder.
 path_to_embrola_alt = "/usr/local/share/mbrola/voices"
@@ -102,8 +103,8 @@
     if not espeak or not mbrola:
         return None
     s = ''.join((echo_in, timeout, espeak, " -k27 -v ", voice, options, " --stdin ", log,
-                " | ", mbrola, " -e ", mboptions, " " + path_to_embrola, mbvoice, 
-                " - $1.wav ", log))
+    " | ", mbrola, " -e ", mboptions, " /usr/local/share/mbrola/", mbvoice,
+        " - $1.wav ", log))
     return [s, espeak_mbrola_lame, espeak_cleanup]
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.