Fix system player being used for live-background

This commit is contained in:
Jonathan Springer 2015-12-07 16:40:09 -05:00
parent 6b35a99775
commit 2e23d9919d
1 changed files with 9 additions and 5 deletions

View File

@ -531,12 +531,16 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
if not title:
continue
player = self.media_players[title]
# The system player may not return what files it can play so add it now
# and check whether it can play the file later
if title == 'system':
self.resize(display, player)
if player.load(display):
self.current_media_players[controller.controller_type] = player
controller.media_info.media_type = MediaType.Video
return True
if not controller.media_info.is_background or controller.media_info.is_background and \
player.can_background:
self.resize(display, player)
if player.load(display):
self.current_media_players[controller.controller_type] = player
controller.media_info.media_type = MediaType.Video
return True
if suffix in player.video_extensions_list:
if not controller.media_info.is_background or controller.media_info.is_background and \
player.can_background: