Commit e3fe946a657b27bc0844137ecc18d77f1b81f90f - sugar-read-activity

Re-enable tts in text backend now Gst bindings are working - SL #3349 The code is copied from Write activity, (should be good have this solved in the toolkit). The togglebutton api to change the icon name is fixed too. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org> Gonzalo Odiard 11 years ago

4 changed file(s) with 48 addition(s) and 51 deletion(s). Raw diff Collapse all Expand all

-9

speech.py less more

16	16
17	17	import logging
18	18
19		_logger = logging.getLogger('read-etexts-activity')
	19	_logger = logging.getLogger('read-activity')
20	20
21	21	supported = True
22	22
23	23	try:
24		import pygst
25		pygst.require("0.10")
26	24	from gi.repository import Gst
27		#Gst.ElementFactory.make('espeak', 'source')
	25	Gst.init(None)
	26	Gst.ElementFactory.make('espeak', None)
28	27	from speech_gst import *
29		_logger.info('use gst-plugins-espeak')
	28	_logger.error('use gst-plugins-espeak')
30	29	except Exception, e:
31		_logger.info('disable gst-plugins-espeak: %s' % e)
	30	_logger.error('disable gst-plugins-espeak: %s' % e)
32	31	try:
33	32	from speech_dispatcher import *
34		_logger.info('use speech-dispatcher')
	33	_logger.error('use speech-dispatcher')
35	34	except Exception, e:
36	35	supported = False
37		_logger.info('disable speech: %s' % e)
	36	_logger.error('disable speech: %s' % e)
38	37
39	38	voice = 'default'
40	39	pitch = 0

43	42	highlight_cb = None
44	43	end_text_cb = None
45	44	reset_cb = None
46		reset_buttons_cb = None

+29

-36

speech_gst.py less more

13	13	# along with this program; if not, write to the Free Software
14	14	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15	15
	16	from gi.repository import Gst
16	17	import logging
17		import pygst
18		pygst.require("0.10")
19		from gi.repository import Gst
20	18
21	19	import speech
22	20
23		_logger = logging.getLogger('read-etexts-activity')
	21	_logger = logging.getLogger('read-activity')
	22
	23
	24	def get_all_voices():
	25	all_voices = {}
	26	for voice in Gst.ElementFactory.make('espeak', None).props.voices:
	27	name, language, dialect = voice
	28	if dialect != 'none':
	29	all_voices[language + '_' + dialect] = name
	30	else:
	31	all_voices[language] = name
	32	return all_voices
24	33
25	34
26	35	def _message_cb(bus, message, pipe):
27		logging.error('gstreamer message %s', message)
28		if message is None:
29		return
30		if message.type == Gst.Message.EOS:
	36	if message.type == Gst.MessageType.EOS:
31	37	pipe.set_state(Gst.State.NULL)
32	38	if speech.end_text_cb != None:
33	39	speech.end_text_cb()
34		if message.type == Gst.Message.ERROR:
	40	if message.type == Gst.MessageType.ERROR:
35	41	pipe.set_state(Gst.State.NULL)
36	42	if pipe is play_speaker[1]:
37		if speech.reset_cb is not None:
38		speech.reset_cb()
39		if speech.reset_buttons_cb is not None:
40		speech.reset_buttons_cb()
41		elif message.type == Gst.Message.ELEMENT and \
	43	speech.reset_cb()
	44	elif message.type == Gst.MessageType.ELEMENT and \
42	45	message.structure.get_name() == 'espeak-mark':
43	46	mark = message.structure['mark']
44	47	speech.highlight_cb(int(mark))
45	48
46	49
47	50	def _create_pipe():
48		pipe = Gst.Pipeline()
49		pipe.set_name('pipeline')
50
51		source = Gst.ElementFactory.make('espeak', 'source')
52		pipe.add(source)
53
54		sink = Gst.ElementFactory.make('autoaudiosink', 'sink')
55		pipe.add(sink)
56		source.link(sink)
	51	pipe = Gst.parse_launch('espeak name=espeak ! autoaudiosink')
	52	source = pipe.get_by_name('espeak')
57	53
58	54	bus = pipe.get_bus()
59	55	bus.add_signal_watch()
60		logging.error('before adding message callback')
61	56	bus.connect('message', _message_cb, pipe)
62		logging.error('ater adding message callback')
63	57
64	58	return (source, pipe)
65	59

72	66	speaker[1].set_state(Gst.State.NULL)
73	67	speaker[1].set_state(Gst.State.PLAYING)
74	68
75		Gst.init_check(None)
	69
76	70	info_speaker = _create_pipe()
77	71	play_speaker = _create_pipe()
78	72	play_speaker[0].props.track = 2

90	84	_speech(play_speaker, words)
91	85
92	86
	87	def pause():
	88	play_speaker[1].set_state(Gst.State.PAUSED)
	89
	90
	91	def continue_play():
	92	play_speaker[1].set_state(Gst.State.PLAYING)
	93
	94
93	95	def is_stopped():
94		for i in play_speaker[1].get_state(1):
	96	for i in play_speaker[1].get_state():
95	97	if isinstance(i, Gst.State) and i == Gst.State.NULL:
96	98	return True
97	99	return False
98	100
99	101
100		def pause():
101		play_speaker[1].set_state(Gst.State.NULL)
102
103
104	102	def stop():
105	103	play_speaker[1].set_state(Gst.State.NULL)
106		play_speaker[0].props.text = ''
107		if speech.reset_cb is not None:
108		speech.reset_cb()
109		if speech.reset_buttons_cb is not None:
110		speech.reset_buttons_cb()

+11

-5

speechtoolbar.py less more

35	35	self._activity = activity
36	36	if not speech.supported:
37	37	return
	38	self.is_paused = False
38	39
39	40	self._cnf_client = GConf.Client.get_default()
40	41	self.load_speech_parameters()

128	129
129	130	def reset_buttons_cb(self):
130	131	logging.error('reset buttons')
131		self.play_btn.set_named_icon('media-playback-start')
	132	self.play_btn.set_icon_name('media-playback-start')
132	133	self.stop_btn.set_sensitive(False)
	134	self.is_paused = False
133	135
134	136	def play_cb(self, widget):
135	137	self.stop_btn.set_sensitive(True)
136	138	if widget.get_active():
137		self.play_btn.set_named_icon('media-playback-pause')
138		if speech.is_stopped():
	139	self.play_btn.set_icon_name('media-playback-pause')
	140	if not self.is_paused:
139	141	speech.play(self._activity._view.get_marked_words())
	142	else:
	143	speech.continue_play()
140	144	else:
141		self.play_btn.set_named_icon('media-playback-start')
	145	self.play_btn.set_icon_name('media-playback-start')
	146	self.is_paused = True
142	147	speech.pause()
143	148
144	149	def stop_cb(self, widget):
145	150	self.stop_btn.set_sensitive(False)
146		self.play_btn.set_named_icon('media-playback-start')
	151	self.play_btn.set_icon_name('media-playback-start')
147	152	self.play_btn.set_active(False)
	153	self.is_paused = False
148	154	speech.stop()

-1

textadapter.py less more

240	240	self.connect('page-changed', handler)
241	241
242	242	def can_do_text_to_speech(self):
243		return False
	243	return True
244	244
245	245	def get_marked_words(self):
246	246	"Adds a mark between each word of text."