sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TTS in the toolkit need initialize gstreamer - Fixes #4851

Browse Source 
If is not initialized, the check for the espeak plugin will fail.
This patch also check for the espeak plugin at the beginnig
avoiding check every time the function enabled() is called.
This commit is contained in:
Gonzalo Odiard 2015-05-12 13:10:17 -03:00 committed by Martin Abente Lahaye
parent 4c22ba5b35
commit fc4d629b50
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/sugar3/speech.py
View File

@ -18,7 +18,6 @@ import os
import logging import logging
from gettext import gettext as _ from gettext import gettext as _
from gi.repository.GLib import GError
from gi.repository import Gio from gi.repository import Gio
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
@ -27,7 +26,10 @@ from gi.repository import GObject
_HAS_GST = True _HAS_GST = True
try: try:
from gi.repository import Gst from gi.repository import Gst
Gst.init(None)
Gst.parse_launch('espeak')
except: except:
logging.error('Gst or the espeak plugin is not installed in the system.')
_HAS_GST = False _HAS_GST = False
from sugar3 import power from sugar3 import power
@ -116,24 +118,6 @@ translated_espeak_voices = {
} }
def _has_espeak_module():
try:
Gst.parse_launch('espeak')
except GError:
logging.error('The speech plugin is not installed in the system.')
return False
return True
def _check_modules():
if not _HAS_GST:
logging.error('GST is not installed in the system.')
return False
if not _has_espeak_module():
return False
return True
class SpeechManager(GObject.GObject): class SpeechManager(GObject.GObject):
__gtype_name__ = 'SpeechManager' __gtype_name__ = 'SpeechManager'
@ -169,7 +153,7 @@ class SpeechManager(GObject.GObject):
self.restore() self.restore()
def enabled(self): def enabled(self):
return _check_modules() return _HAS_GST
def _update_state(self, player, signal): def _update_state(self, player, signal):
self._is_playing = (signal == 'play') self._is_playing = (signal == 'play')
@ -277,7 +261,6 @@ class _GstSpeechPlayer(GObject.GObject):
} }
def __init__(self): def __init__(self):
Gst.init(None)
GObject.GObject.__init__(self) GObject.GObject.__init__(self)
self._pipeline = None self._pipeline = None
self._all_voices = None self._all_voices = None