raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

shorter solution

Browse Source
This commit is contained in:
Andreas Preikschat 2012-04-28 15:10:54 +02:00
parent 9dc7d1a795
commit 9668b22f85
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openlp/core/ui/media/vlcplayer.py
View File

@ -26,6 +26,7 @@
############################################################################### ###############################################################################
from datetime import datetime from datetime import datetime
from distutils.version import LooseVersion
import logging import logging
import os import os
import sys import sys
@ -53,16 +54,12 @@ except OSError, e:
if VLC_AVAILABLE: if VLC_AVAILABLE:
try: try:
# Older versions of vlc fail here. version = vlc.libvlc_get_version()
vlcInstance = vlc.Instance() except:
vlcInstance.media_player_new()
except AttributeError:
VLC_AVAILABLE = False
version = u'0.0.0' version = u'0.0.0'
try: if LooseVersion(version) < '1.1.0':
version = vlc.libvlc_get_version() VLC_AVAILABLE = False
finally: log.debug(u'VLC could not be loaded: %s' % version)
log.debug(u'VLC could not be loaded: %s' % version)
AUDIO_EXT = [ AUDIO_EXT = [
u'*.mp3' u'*.mp3'