Fix Presentations and Media

This commit is contained in:
Tim Bentley 2015-11-28 15:37:26 +00:00
parent 4c7be1b5cf
commit ae1888106d
3 changed files with 14 additions and 2 deletions

View File

@ -514,9 +514,14 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
:param display: Which display to use :param display: Which display to use
:param service_item: The ServiceItem containing the details to be played. :param service_item: The ServiceItem containing the details to be played.
""" """
used_players = get_media_players()[0] used_players = get_media_players()
default_player = used_players[0]
if service_item.processor and service_item.processor != UiStrings().Automatic: if service_item.processor and service_item.processor != UiStrings().Automatic:
used_players = [service_item.processor.lower()] # check to see if the player is usable else use the default one.
if not service_item.processor.lower() in used_players:
used_players = default_player
else:
used_players = [service_item.processor.lower()]
# If no player, we can't play # If no player, we can't play
if not used_players: if not used_players:
return False return False

View File

@ -396,6 +396,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
:param suffix_list: New Suffix's to be supported :param suffix_list: New Suffix's to be supported
""" """
print(suffix_list)
if isinstance(suffix_list, str): if isinstance(suffix_list, str):
self.suffixes.append(suffix_list) self.suffixes.append(suffix_list)
else: else:

View File

@ -346,6 +346,12 @@ class MessageListener(object):
self.handler = self.media_item.find_controller_by_type(file) self.handler = self.media_item.find_controller_by_type(file)
if not self.handler: if not self.handler:
return return
else:
# the saved handler is not present so need to use one based on file suffix.
if not self.controllers[self.handler].available:
self.handler = self.media_item.find_controller_by_type(file)
if not self.handler:
return
if is_live: if is_live:
controller = self.live_handler controller = self.live_handler
else: else: