From 41980a3a46f83f7bbfa7564abb4bcc30f6ab8a59 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Sat, 15 Sep 2012 13:16:58 +0200 Subject: [PATCH] Fix #963894: disable vlc backend completely for osx. --- openlp/core/ui/media/mediacontroller.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 3ce38540c..ce8e32354 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -28,6 +28,7 @@ import logging import os +import sys from PyQt4 import QtCore, QtGui from openlp.core.lib import OpenLPToolbar, Receiver, translate @@ -105,6 +106,10 @@ class MediaController(object): AppLocation.get_directory(AppLocation.AppDir), u'core', u'ui', u'media') for filename in os.listdir(controller_dir): + # TODO vlc backend is not yet working on Mac OS X. + # For now just ignore vlc backend on Mac OS X. + if sys.platform == 'darwin' and filename == 'vlcplayer.py': + continue if filename.endswith(u'player.py') and not \ filename == 'media_player.py': path = os.path.join(controller_dir, filename) @@ -115,7 +120,7 @@ class MediaController(object): try: __import__(modulename, globals(), locals(), []) # On some platforms importing vlc.py might cause - # also OSError exception. (e.g. Mac OS X) + # also OSError exceptions. (e.g. Mac OS X) except (ImportError, OSError): log.warn(u'Failed to import %s on path %s', modulename, path)