forked from openlp/openlp
bugfixing
This commit is contained in:
commit
4fc4bacfa7
@ -301,13 +301,6 @@ class MainDisplay(Display):
|
|||||||
# clear the cache
|
# clear the cache
|
||||||
self.override = {}
|
self.override = {}
|
||||||
|
|
||||||
def isWebLoaded(self):
|
|
||||||
"""
|
|
||||||
Called by webView event to show display is fully loaded
|
|
||||||
"""
|
|
||||||
log.debug(u'Webloaded')
|
|
||||||
self.webLoaded = True
|
|
||||||
|
|
||||||
def preview(self):
|
def preview(self):
|
||||||
"""
|
"""
|
||||||
Generates a preview of the image displayed.
|
Generates a preview of the image displayed.
|
||||||
|
@ -329,24 +329,20 @@ class MediaController(object):
|
|||||||
display.frame.evaluateJavaScript(u'show_video( \
|
display.frame.evaluateJavaScript(u'show_video( \
|
||||||
"setBackBoard", null, null, null,"visible");')
|
"setBackBoard", null, null, null,"visible");')
|
||||||
# now start playing
|
# now start playing
|
||||||
if self.video_play([controller], False):
|
if controller.isLive and \
|
||||||
self.video_pause([controller])
|
(QtCore.QSettings().value(u'general/auto unblank',
|
||||||
self.video_seek([controller, [0]])
|
QtCore.QVariant(False)).toBool() or \
|
||||||
if controller.isLive and \
|
controller.media_info.is_background == True) or \
|
||||||
(QtCore.QSettings().value(u'general/auto unblank',
|
controller.isLive == False:
|
||||||
QtCore.QVariant(False)).toBool() or \
|
if not self.video_play([controller]):
|
||||||
controller.media_info.is_background == True) or \
|
critical_error_message_box(
|
||||||
controller.isLive == False:
|
translate('MediaPlugin.MediaItem', 'Unsupported File'),
|
||||||
self.video_play([controller])
|
unicode(translate('MediaPlugin.MediaItem',
|
||||||
self.set_controls_visible(controller, True)
|
'Unsupported File')))
|
||||||
log.debug(u'use %s controller' % self.curDisplayMediaPlayer[display])
|
return False
|
||||||
return True
|
self.set_controls_visible(controller, True)
|
||||||
else:
|
log.debug(u'use %s controller' % self.curDisplayMediaPlayer[display])
|
||||||
critical_error_message_box(
|
return True
|
||||||
translate('MediaPlugin.MediaItem', 'Unsupported File'),
|
|
||||||
unicode(translate('MediaPlugin.MediaItem',
|
|
||||||
'Unsupported File')))
|
|
||||||
return False
|
|
||||||
|
|
||||||
def check_file_type(self, controller, display):
|
def check_file_type(self, controller, display):
|
||||||
"""
|
"""
|
||||||
|
@ -326,11 +326,17 @@ class WebkitPlayer(MediaPlayer):
|
|||||||
controller = display.controller
|
controller = display.controller
|
||||||
display.webLoaded = True
|
display.webLoaded = True
|
||||||
length = 0
|
length = 0
|
||||||
|
start_time = 0
|
||||||
|
if self.state != MediaState.Paused and \
|
||||||
|
controller.media_info.start_time > 0:
|
||||||
|
start_time = controller.media_info.start_time
|
||||||
self.set_visible(display, True)
|
self.set_visible(display, True)
|
||||||
if controller.media_info.is_flash:
|
if controller.media_info.is_flash:
|
||||||
display.frame.evaluateJavaScript(u'show_flash("play");')
|
display.frame.evaluateJavaScript(u'show_flash("play");')
|
||||||
else:
|
else:
|
||||||
display.frame.evaluateJavaScript(u'show_video("play");')
|
display.frame.evaluateJavaScript(u'show_video("play");')
|
||||||
|
if start_time > 0:
|
||||||
|
self.seek(display, controller.media_info.start_time*1000)
|
||||||
# TODO add playing check and get the correct media length
|
# TODO add playing check and get the correct media length
|
||||||
controller.media_info.length = length
|
controller.media_info.length = length
|
||||||
self.state = MediaState.Playing
|
self.state = MediaState.Playing
|
||||||
|
@ -87,6 +87,8 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
self.videobackgroundReplaced)
|
self.videobackgroundReplaced)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'mediaitem_media_rebuild'), self.rebuild)
|
QtCore.SIGNAL(u'mediaitem_media_rebuild'), self.rebuild)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'config_screen_changed'), self.displaySetup)
|
||||||
# Allow DnD from the desktop
|
# Allow DnD from the desktop
|
||||||
self.listView.activateDnD()
|
self.listView.activateDnD()
|
||||||
|
|
||||||
@ -232,7 +234,11 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
'Videos (%s);;Audio (%s);;%s (*)')) % (
|
'Videos (%s);;Audio (%s);;%s (*)')) % (
|
||||||
u' '.join(self.plugin.video_extensions_list),
|
u' '.join(self.plugin.video_extensions_list),
|
||||||
u' '.join(self.plugin.audio_extensions_list), UiStrings().AllFiles)
|
u' '.join(self.plugin.audio_extensions_list), UiStrings().AllFiles)
|
||||||
|
|
||||||
|
def displaySetup(self):
|
||||||
|
self.plugin.mediaController.setup_display( \
|
||||||
|
self.mediaController.previewDisplay)
|
||||||
|
|
||||||
|
|
||||||
def populateDisplayTypes(self):
|
def populateDisplayTypes(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user