Commit 0df3bc53 authored by Joanmarie Diggs's avatar Joanmarie Diggs

Revert "Re-enable the "interrupt" option in speechdispatcher factory"

The code in speech.py is very pro-interruption. It gets called by the
scripts for multiple-utterance presentation. Without some significant
changes, we're in danger of cutting off all but the last utterance. :(

This reverts commit ce033c08.
parent 60e498ce
...@@ -585,9 +585,9 @@ class SpeechServer(speechserver.SpeechServer): ...@@ -585,9 +585,9 @@ class SpeechServer(speechserver.SpeechServer):
return families return families
def speak(self, text=None, acss=None, interrupt=False): def speak(self, text=None, acss=None, interrupt=True):
if interrupt: #if interrupt:
self._cancel() # self._cancel()
# "We will not interrupt a key echo in progress." (Said the comment in # "We will not interrupt a key echo in progress." (Said the comment in
# speech.py where these next two lines used to live. But the code here # speech.py where these next two lines used to live. But the code here
...@@ -599,10 +599,9 @@ class SpeechServer(speechserver.SpeechServer): ...@@ -599,10 +599,9 @@ class SpeechServer(speechserver.SpeechServer):
if text: if text:
self._speak(text, acss) self._speak(text, acss)
def speakUtterances(self, utteranceList, acss=None, interrupt=False): def speakUtterances(self, utteranceList, acss=None, interrupt=True):
if interrupt: #if interrupt:
self._cancel() # self._cancel()
for utterance in utteranceList: for utterance in utteranceList:
if utterance: if utterance:
self._speak(utterance, acss) self._speak(utterance, acss)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment