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

Disable webkit and phonon mediaplayers on Mac for now

Browse Source
This commit is contained in:
Tomas Groth 2014-12-26 22:52:14 +00:00
parent 98a3cd127f
commit aae831e90d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/ui/media/phononplayer.py
View File

@ -39,6 +39,7 @@ from openlp.core.lib import translate
from openlp.core.ui.media import MediaState from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer from openlp.core.ui.media.mediaplayer import MediaPlayer
from openlp.core.common import is_macosx
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -124,7 +125,11 @@ class PhononPlayer(MediaPlayer):
""" """
Check if the player is available Check if the player is available
""" """
return True # At the moment we don't have support for phononplayer on Mac OS X
if is_macosx():
return False
else:
return True
def load(self, display): def load(self, display):
""" """

8
openlp/core/ui/media/webkitplayer.py
View File

@ -33,7 +33,7 @@ from PyQt4 import QtGui
import logging import logging
from openlp.core.common import Settings from openlp.core.common import Settings, is_macosx
from openlp.core.lib import translate from openlp.core.lib import translate
from openlp.core.ui.media import MediaState from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer from openlp.core.ui.media.mediaplayer import MediaPlayer
@ -231,7 +231,11 @@ class WebkitPlayer(MediaPlayer):
""" """
Check the availability of the media player Check the availability of the media player
""" """
return True # At the moment we don't have support for webkitplayer on Mac OS X
if is_macosx():
return False
else:
return True
def load(self, display): def load(self, display):
""" """