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

Fix video injection and have black backgrounds

Browse Source
This commit is contained in:
Tim Bentley 2012-09-29 17:27:55 +01:00
parent 436063b1ec
commit a3e41b1ee7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,9 +39,11 @@ VIDEO_CSS = u"""
background-color: black; background-color: black;
} }
#video1 { #video1 {
background-color: black;
z-index:4; z-index:4;
} }
#video2 { #video2 {
background-color: black;
z-index:4; z-index:4;
} }
""" """

8
openlp/plugins/media/lib/mediaitem.py
View File

@ -176,8 +176,14 @@ class MediaMediaItem(MediaManagerItem):
item = self.listView.currentItem() item = self.listView.currentItem()
filename = unicode(item.data(QtCore.Qt.UserRole).toString()) filename = unicode(item.data(QtCore.Qt.UserRole).toString())
if os.path.exists(filename): 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( if self.plugin.liveController.mediaController.video(
self.plugin.liveController, filename, True, True): self.plugin.liveController, service_item, True, True):
self.resetAction.setVisible(True) self.resetAction.setVisible(True)
else: else:
critical_error_message_box(UiStrings().LiveBGError, critical_error_message_box(UiStrings().LiveBGError,