This commit is contained in:
Tim Bentley 2012-10-25 22:03:12 +01:00
parent 90a3493d89
commit a5fc3ea3f7
2 changed files with 9 additions and 5 deletions

View File

@ -350,7 +350,7 @@ class MediaController(object):
"""
player.resize(display)
def video(self, source, serviceItem, hidden=False):
def video(self, source, serviceItem, hidden=False, videoBehindText=False):
"""
Loads and starts a video to run with the option of sound
@ -362,6 +362,9 @@ class MediaController(object):
``hidden``
The player which is doing the playing
``videoBehindText``
Is the video to be played behind text.
"""
log.debug(u'video')
isValid = False
@ -369,12 +372,12 @@ class MediaController(object):
# stop running videos
self.media_reset(controller)
controller.media_info = MediaInfo()
if source == DisplayControllerType.Plugin:
if videoBehindText:
controller.media_info.volume = 0
controller.media_info.is_background = False
controller.media_info.is_background = True
else:
controller.media_info.volume = controller.volumeSlider.value()
controller.media_info.is_background = True
controller.media_info.is_background = False
controller.media_info.file_info = \
QtCore.QFileInfo(serviceItem.get_filename())
display = None

View File

@ -174,7 +174,8 @@ class MediaMediaItem(MediaManagerItem):
(path, name) = os.path.split(filename)
service_item.add_from_command(path, name,CLAPPERBOARD)
if self.plugin.liveController.mediaController.video(
DisplayControllerType.Live, service_item):
DisplayControllerType.Live, service_item,
videoBehindText=True):
self.resetAction.setVisible(True)
else:
critical_error_message_box(UiStrings().LiveBGError,