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

Fixes and handle missing display

This commit is contained in:
Tim Bentley 2019-04-08 18:19:18 +01:00
parent 0a2de8e606
commit 6bea242ae4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/settings.py
View File

@ -202,7 +202,7 @@ class Settings(QtCore.QSettings):
'core/view mode': 'default', 'core/view mode': 'default',
# The other display settings (display position and dimensions) are defined in the ScreenList class due to a # The other display settings (display position and dimensions) are defined in the ScreenList class due to a
# circular dependency. # circular dependency.
'core/display on monitor': True, 'core/display on monitor': False,
'core/override position': False, 'core/override position': False,
'core/monitor': {}, 'core/monitor': {},
'core/application version': '0.0', 'core/application version': '0.0',

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

@ -138,7 +138,10 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
Set up the controllers. Set up the controllers.
:return: :return:
""" """
self.setup_display(self.live_controller.display, False) try:
self.setup_display(self.live_controller.display, False)
except AttributeError:
State().update_pre_conditions('media', False)
self.setup_display(self.preview_controller.preview_display, True) self.setup_display(self.preview_controller.preview_display, True)
def display_controllers(self, controller_type): def display_controllers(self, controller_type):

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

@ -224,7 +224,7 @@ class VlcPlayer(MediaPlayer):
return False return False
output_display.vlc_media = audio_cd_tracks.item_at_index(controller.media_info.title_track) output_display.vlc_media = audio_cd_tracks.item_at_index(controller.media_info.title_track)
elif controller.media_info.media_type == MediaType.Stream: elif controller.media_info.media_type == MediaType.Stream:
output_display.vlc_media = output_display.vlc_instance.media_new_location("ZZZZZZ") output_display.vlc_media = output_display.vlc_instance.media_new_location('ZZZZZZ')
else: else:
output_display.vlc_media = output_display.vlc_instance.media_new_path(path) output_display.vlc_media = output_display.vlc_instance.media_new_path(path)
# put the media in the media player # put the media in the media player