storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix things

Browse Source
This commit is contained in:
chrys
2016-08-10 15:30:43 +02:00
parent ed27566474
commit 7b4be74688
9 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fenrir-package/core/outputManager.py
View File

@@ -3,8 +3,8 @@
class outputManager():
def __init__(self):
pass
def presentText(self, environment, text, interrupt=True, soundIconName = ''):
if self.playSoundIcon(environment, soundIconName, interrupt):
def presentText(self, environment, text, interrupt=True, soundIcon = ''):
if self.playSoundIcon(environment, soundIcon, interrupt):
return
self.speakText(environment, text, interrupt)
self.brailleText(environment, text, interrupt)
@@ -34,8 +34,8 @@ class outputManager():
environment['runtime']['speechDriver'].cancel()
environment['runtime']['soundDriver'].cancel()
def playSoundIcon(self, environment, soundIconName = '', interrupt=True):
if soundIconName == '':
def playSoundIcon(self, environment, soundIcon = '', interrupt=True):
if soundIcon == '':
return False
if not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'sound', 'enabled'):
return False
@@ -43,8 +43,8 @@ class outputManager():
return False
try:
environment['runtime']['soundDriver'].setVolume(environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'sound', 'volume'))
environment['runtime']['soundDriver'].playSoundFile(environment['soundIcons'][soundIconName], interrupt)
environment['runtime']['soundDriver'].playSoundFile(environment['soundIcons'][soundIcon], interrupt)
return True
except:
print('no icon there for' + soundIconName)
pass
return False