From 9472a3f6fa71b5fb43985e92f33111ac89dbefc7 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 7 May 2017 13:18:37 -0400 Subject: [PATCH 1/2] Updated storm settings file to use generic speech driver by default. --- config/settings/settings.conf.storm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/settings/settings.conf.storm b/config/settings/settings.conf.storm index 10432155..60602fc5 100644 --- a/config/settings/settings.conf.storm +++ b/config/settings/settings.conf.storm @@ -9,7 +9,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine [speech] enabled=True -driver=speechdDriver +#driver=speechdDriver +driver=genericDriver rate=0.85 pitch=0.5 # Pitch for capital letters @@ -40,6 +41,7 @@ fenrirMinPitch=0 fenrirMaxPitch=99 fenrirMinRate=80 fenrirMaxRate=450 +fenrirVoice=en-us [braille] From 7e77392c043379675984b72c251b3a028662c8fa Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 7 May 2017 20:00:33 +0200 Subject: [PATCH 2/2] fix typo --- config/settings/settings.conf.storm | 2 +- src/fenrir/speechDriver/genericDriver.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/settings/settings.conf.storm b/config/settings/settings.conf.storm index 60602fc5..a7dde90f 100644 --- a/config/settings/settings.conf.storm +++ b/config/settings/settings.conf.storm @@ -99,7 +99,7 @@ interruptOnKeyPressFilter= doubleTapTimeout=0.2 [general] -debugLevel=0 +debugLevel=1 punctuationProfile=default punctuationLevel=some respectPunctuationPause=True diff --git a/src/fenrir/speechDriver/genericDriver.py b/src/fenrir/speechDriver/genericDriver.py index 71e2f2dc..ee033b8f 100644 --- a/src/fenrir/speechDriver/genericDriver.py +++ b/src/fenrir/speechDriver/genericDriver.py @@ -148,14 +148,14 @@ class driver(): popenSpeechCommand = popenSpeechCommand.replace('fenrirPitch', str(utterance['pitch']).replace('"','')) popenSpeechCommand = popenSpeechCommand.replace('fenrirRate', str(utterance['rate']).replace('"','')) popenSpeechCommand = popenSpeechCommand.replace('fenrirText', str(utterance['text']).replace('"','').replace('\n','')) - + try: self.lock.acquire(True) self.proc = Popen(popenSpeechCommand, shell=True) self.lock.release() - self.proc.wait() # critical for MT? - if we lock it we deadlock it maybe. + self.proc.wait() except Exception as e: - self.env['runtime']['debug'].writeDebugOut('speechDriver:worker:'str(e),debug.debugLevel.ERROR) + self.env['runtime']['debug'].writeDebugOut('speechDriver:worker:' + str(e),debug.debugLevel.ERROR) self.lock.acquire(True) self.proc = None self.lock.release()