fix espeak driver

This commit is contained in:
chrys 2016-11-05 14:51:55 +01:00
parent 72a739e099
commit 4060aee1a3
2 changed files with 8 additions and 4 deletions

View File

@ -23,8 +23,8 @@ settings = {
'capitalPitch':0.8, 'capitalPitch':0.8,
'volume': 1.0, 'volume': 1.0,
'module': 'espeak', 'module': 'espeak',
'voice': 'en', 'voice': '',
'language': 'en', 'language': 'english-us',
'autoReadIncoming': True, 'autoReadIncoming': True,
}, },
'braille':{ 'braille':{

View File

@ -50,18 +50,20 @@ class driver():
def setVoice(self, voice): def setVoice(self, voice):
if not self._isInitialized: if not self._isInitialized:
return False return False
if voice =='':
return False
return self._es.set_voice(voice) return self._es.set_voice(voice)
def setPitch(self, pitch): def setPitch(self, pitch):
if not self._isInitialized: if not self._isInitialized:
return False return False
return self._es.set_parameter(self._es.Parameter().Pitch, int(pitch * 99))
def setRate(self, rate): def setRate(self, rate):
if not self._isInitialized: if not self._isInitialized:
return False return False
return self._es.set_parameter(self._es.Parameter().Rate, int(rate*450 + 80)) return self._es.set_parameter(self._es.Parameter().Rate, int(rate*450 + 80))
return self._es.set_parameter(self._es.Parameter().Pitch, int(pitch * 99))
def setModule(self, module): def setModule(self, module):
if not self._isInitialized: if not self._isInitialized:
return False return False
@ -69,6 +71,8 @@ class driver():
def setLanguage(self, language): def setLanguage(self, language):
if not self._isInitialized: if not self._isInitialized:
return False return False
if language =='':
return False
return self._es.set_voice(language) return self._es.set_voice(language)
def setVolume(self, volume): def setVolume(self, volume):