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

Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None

Browse Source
This commit is contained in:
Raoul Snyman 2015-05-28 22:38:43 +02:00
parent aa97feb064
commit 5bcdc85ce1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/media/mediacontroller.py
View File

@ -515,7 +515,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
:param service_item: The ServiceItem containing the details to be played.
"""
used_players = get_media_players()[0]
if service_item.processor != UiStrings().Automatic:
if service_item.processor and service_item.processor != UiStrings().Automatic:
used_players = [service_item.processor.lower()]
# If no player, we can't play
if not used_players:

3
openlp/plugins/media/lib/mediaitem.py
View File

@ -34,6 +34,7 @@ from openlp.core.ui import DisplayController, Display, DisplayControllerType
from openlp.core.ui.media import get_media_players, set_media_players, parse_optical_path, format_milliseconds
from openlp.core.utils import get_locale_key
from openlp.core.ui.media.vlcplayer import get_vlc
if get_vlc() is not None:
from openlp.plugins.media.forms.mediaclipselectorform import MediaClipSelectorForm
@ -412,7 +413,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
When the load optical button is clicked, open the clip selector window.
"""
# self.media_clip_selector_form.exec_()
if VLC_AVAILABLE:
if get_vlc():
media_clip_selector_form = MediaClipSelectorForm(self, self.main_window, None)
media_clip_selector_form.exec_()
del media_clip_selector_form