From a3e41b1ee7f89052e0edf2b7dac78861d6cc560d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 29 Sep 2012 17:27:55 +0100 Subject: [PATCH] Fix video injection and have black backgrounds --- openlp/core/ui/media/webkitplayer.py | 2 ++ openlp/plugins/media/lib/mediaitem.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py index aad9710c0..e3ac5012e 100644 --- a/openlp/core/ui/media/webkitplayer.py +++ b/openlp/core/ui/media/webkitplayer.py @@ -39,9 +39,11 @@ VIDEO_CSS = u""" background-color: black; } #video1 { + background-color: black; z-index:4; } #video2 { + background-color: black; z-index:4; } """ diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 604bf5952..507663e12 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -176,8 +176,14 @@ class MediaMediaItem(MediaManagerItem): item = self.listView.currentItem() filename = unicode(item.data(QtCore.Qt.UserRole).toString()) if os.path.exists(filename): + service_item = ServiceItem() + service_item.title = unicode(self.displayTypeComboBox.currentText()) + service_item.shortname = service_item.title + (path, name) = os.path.split(filename) + service_item.add_from_command(path, name, + u':/media/image_clapperboard.png') if self.plugin.liveController.mediaController.video( - self.plugin.liveController, filename, True, True): + self.plugin.liveController, service_item, True, True): self.resetAction.setVisible(True) else: critical_error_message_box(UiStrings().LiveBGError,