add autoReadIncomming, add sound volume, convert volume to 0.0 - 1.0 factor for unification

This commit is contained in:
chrys
2016-08-08 09:34:57 +02:00
parent 152453c232
commit 0e973b6f1d
10 changed files with 27 additions and 12 deletions

View File

@ -21,7 +21,7 @@ class outputManager():
environment['runtime']['speechDriver'].setPitch(environment['runtime']['settingsManager'].getSettingAsInt(environment, 'speech', 'pitch'))
environment['runtime']['speechDriver'].setSpeed(environment['runtime']['settingsManager'].getSettingAsInt(environment, 'speech', 'rate'))
environment['runtime']['speechDriver'].setModule(environment['runtime']['settingsManager'].getSetting(environment, 'speech', 'module'))
environment['runtime']['speechDriver'].setVolume(environment['runtime']['settingsManager'].getSettingAsInt(environment, 'speech', 'volume'))
environment['runtime']['speechDriver'].setVolume(environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'speech', 'volume'))
environment['runtime']['speechDriver'].speak(text)
def brailleText(self, environment, text, soundIconName = '', interrupt=True):
@ -42,6 +42,7 @@ class outputManager():
if environment['runtime']['soundDriver'] == None:
return False
try:
environment['runtime']['soundDriver'].setVolume(environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'sound', 'volume'))
environment['runtime']['soundDriver'].playSoundFile(environment['soundIcons'][soundIconName], interrupt)
return True
except:

View File

@ -7,6 +7,7 @@ settings = {
'enabled': False,
'driver': 'sox',
'theme': 'default',
'volume':1.0,
},
'speech':{
'enabled': True,
@ -16,7 +17,8 @@ settings = {
'module': '',
'voice': 'de',
'language': 'de',
'volume': 100
'volume': 1.0,
'autoReadIncomming':True,
},
'braille':{
'enabled': False,
@ -31,6 +33,7 @@ settings = {
'punctuationLevel': 1
},
'keyboard':{
'device':"all",
'keyboardLayout': "desktop",
'charEcho':False,
'charDeleteEcho':True,

View File

@ -116,7 +116,7 @@ class settingsManager():
try:
value = environment['settings'].get(section, setting)
except:
value = self.settings[section][setting]
value = str(self.settings[section][setting])
return value
def getSettingAsInt(self, environment, section, setting):