copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dont test if winsound is available 

Its a standard library which will be always available in our builds
This commit is contained in:
Philipp Hörist 2018-11-10 18:54:00 +01:00
parent 8061146d4f
commit 959a51c5f5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gajim/common/helpers.py
View File

@ -62,15 +62,7 @@ except ImportError:
HAS_PRECIS_I18N = False HAS_PRECIS_I18N = False
HAS_SOUND = True HAS_SOUND = True
if sys.platform == 'win32': if sys.platform == 'darwin':
try:
import winsound # windows-only built-in module for playing wav
except ImportError:
HAS_SOUND = False
print('Gajim is not able to playback sound because'
'pywin32 is missing', file=sys.stderr)
elif sys.platform == 'darwin':
try: try:
from AppKit import NSSound from AppKit import NSSound
except ImportError: except ImportError:
@ -766,12 +758,15 @@ def play_sound_file(path_to_soundfile):
path_to_soundfile = check_soundfile_path(path_to_soundfile) path_to_soundfile = check_soundfile_path(path_to_soundfile)
if path_to_soundfile is None: if path_to_soundfile is None:
return return
if sys.platform == 'win32' and HAS_SOUND:
if sys.platform == 'win32':
import winsound
try: try:
winsound.PlaySound(path_to_soundfile, winsound.PlaySound(path_to_soundfile,
winsound.SND_FILENAME|winsound.SND_ASYNC) winsound.SND_FILENAME|winsound.SND_ASYNC)
except Exception: except Exception:
log.exception('Sound Playback Error') log.exception('Sound Playback Error')
elif sys.platform == 'linux': elif sys.platform == 'linux':
if app.config.get('soundplayer') == '': if app.config.get('soundplayer') == '':
def _oss_play(): def _oss_play():