forked from openlp/openlp
Disable webkit and phonon mediaplayers on Mac for now
This commit is contained in:
parent
98a3cd127f
commit
aae831e90d
@ -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,6 +125,10 @@ class PhononPlayer(MediaPlayer):
|
|||||||
"""
|
"""
|
||||||
Check if the player is available
|
Check if the player is available
|
||||||
"""
|
"""
|
||||||
|
# At the moment we don't have support for phononplayer on Mac OS X
|
||||||
|
if is_macosx():
|
||||||
|
return False
|
||||||
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def load(self, display):
|
def load(self, display):
|
||||||
|
@ -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,6 +231,10 @@ class WebkitPlayer(MediaPlayer):
|
|||||||
"""
|
"""
|
||||||
Check the availability of the media player
|
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
|
return True
|
||||||
|
|
||||||
def load(self, display):
|
def load(self, display):
|
||||||
|
Loading…
Reference in New Issue
Block a user