From d83c269464cf301fc71067ecf7702eefd6f5816d Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 05 Feb 2009 23:35:29 +0000
Subject: Switch Espeak to gst-plugins-espeak

---
(limited to 'Speak.activity/voice.py')

diff --git a/Speak.activity/voice.py b/Speak.activity/voice.py
index fda72dc..aaf5ea2 100644
--- a/Speak.activity/voice.py
+++ b/Speak.activity/voice.py
@@ -22,8 +22,8 @@
 #     along with Speak.activity.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import subprocess
 import re, os
+import gst
 from gettext import gettext as _
 
 # Lets trick gettext into generating entries for the voice names we expect espeak to have
@@ -68,9 +68,8 @@ expectedVoiceNames = [
 _allVoices = {}
 
 class Voice:
-    def __init__(self, language, gender, name):
+    def __init__(self, language, name):
         self.language = language
-        self.gender = gender
         self.name = name
 
         friendlyname = name
@@ -83,16 +82,14 @@ class Voice:
     
 def allVoices():
     if len(_allVoices) == 0:
-        result = subprocess.Popen(["espeak", "--voices"], stdout=subprocess.PIPE).communicate()[0]
-        for line in result.split('\n'):
-            m = re.match(r'\s*\d+\s+([\w-]+)\s+([MF])\s+([\w_-]+)\s+(.+)', line)
-            if m:
-                language, gender, name, stuff = m.groups()
-                if stuff.startswith('mb/') or name in ('en-rhotic','english_rp','english_wmids'):
-                    # these voices don't produce sound
-                    continue
-                voice = Voice(language, gender, name)
-                _allVoices[voice.friendlyname] = voice
+        for i in gst.element_factory_make('espeak').props.voices:
+            name, language = i.split(':')
+            if name in ('en-rhotic','english_rp','english_wmids'):
+                # these voices don't produce sound
+                continue
+            voice = Voice(language, name)
+            _allVoices[voice.friendlyname] = voice
+
     return _allVoices
 
 def defaultVoice():
--
cgit v0.9.1