From 28222ed0f87b83b2893f4d5614102c9c6d1dc1b1 Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Sun, 25 Jan 2015 22:00:14 +0000 Subject: [PATCH] fix check_available to work on feature detection --- openlp/core/ui/media/webkitplayer.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py index 9673240a6..d33aec7c0 100644 --- a/openlp/core/ui/media/webkitplayer.py +++ b/openlp/core/ui/media/webkitplayer.py @@ -22,11 +22,11 @@ """ The :mod:`~openlp.core.ui.media.webkit` module contains our WebKit video player """ -from PyQt4 import QtGui +from PyQt4 import QtGui, QtWebKit import logging -from openlp.core.common import Settings, is_macosx +from openlp.core.common import Settings from openlp.core.lib import translate from openlp.core.ui.media import MediaState from openlp.core.ui.media.mediaplayer import MediaPlayer @@ -224,11 +224,9 @@ class WebkitPlayer(MediaPlayer): """ Check the availability of the media player """ - # At the moment we don't have support for webkitplayer on Mac OS X - if is_macosx(): - return False - else: - return True + web = QtWebKit.QWebPage() + return web.mainFrame().evaluateJavaScript( + "Object.prototype.toString.call(document.createElement('video'));") == '[object HTMLVideoElement]' def load(self, display): """