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

dont push

Browse Source
This commit is contained in:
chrys
2016-07-28 23:52:20 +02:00
parent 35a0dbd2fe
commit 6a117ac998
8 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,9 @@ class outputManager():
if environment['runtime']['soundDriver'] == None:
return
print(soundIconName)
environment['runtime']['soundDriver'].playSoundFile( environment['soundIcons'][soundIconName], interrupt)
try:
print(environment['soundIcons'][soundIconName])
environment['runtime']['soundDriver'].playSoundFile(environment, environment['soundIcons'][soundIconName], interrupt)
environment['runtime']['soundDriver'].playSoundFile(environment['soundIcons'][soundIconName], interrupt)
except:
print('no icon there for' + IconName)
print('no icon there for' + soundIconName)

6
src/fenrir-package/core/settingsManager.py
View File

@ -86,16 +86,20 @@ class settingsManager():
Values[1] = Values[1].replace("'","")
Values[1] = Values[1].replace('"',"")
validSoundIcon = False
FilePath = ''
if os.path.exists(Values[1]):
FilePath = Values[1]
validKeyString = True
validSoundIcon = True
else:
if not soundIconPath.endswith("/"):
soundIconPath += '/'
if os.path.exists(soundIconPath + Values[1]):
FilePath = soundIconPath + Values[1]
validSoundIcon = True
if validSoundIcon:
environment['soundIcons'][soundIcon] = FilePath
siConfig.close()
print(environment['soundIcons'])
return environment
def loadSettings(self, environment, settingConfigPath='../../config/settings/settings.conf'):