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

renamed videoBehindText

Browse Source
This commit is contained in:
Andreas Preikschat 2013-03-06 23:50:49 +01:00
parent 8383acf636
commit 1d9425c3b7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,7 +359,7 @@ class MediaController(object):
""" """
player.resize(display) player.resize(display)
def video(self, source, service_item, hidden=False, videoBehindText=False): def video(self, source, service_item, hidden=False, video_behind_text=False):
""" """
Loads and starts a video to run with the option of sound Loads and starts a video to run with the option of sound
@ -372,7 +372,7 @@ class MediaController(object):
``hidden`` ``hidden``
The player which is doing the playing The player which is doing the playing
``videoBehindText`` ``video_behind_text``
Is the video to be played behind text. Is the video to be played behind text.
""" """
log.debug(u'video') log.debug(u'video')
@ -382,7 +382,7 @@ class MediaController(object):
self.media_reset(controller) self.media_reset(controller)
controller.media_info = MediaInfo() controller.media_info = MediaInfo()
controller.media_info.volume = controller.volumeSlider.value() controller.media_info.volume = controller.volumeSlider.value()
controller.media_info.is_background = videoBehindText controller.media_info.is_background = video_behind_text
controller.media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path()) controller.media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
display = self._define_display(controller) display = self._define_display(controller)
if controller.is_live: if controller.is_live:

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

@ -152,8 +152,7 @@ class MediaMediaItem(MediaManagerItem):
service_item.shortname = service_item.title service_item.shortname = service_item.title
(path, name) = os.path.split(filename) (path, name) = os.path.split(filename)
service_item.add_from_command(path, name,CLAPPERBOARD) service_item.add_from_command(path, name,CLAPPERBOARD)
if self.media_controller.video(DisplayControllerType.Live, service_item, if self.media_controller.video(DisplayControllerType.Live, service_item, video_behind_text=True):
videoBehindText=True):
self.resetAction.setVisible(True) self.resetAction.setVisible(True)
else: else:
critical_error_message_box(UiStrings().LiveBGError, critical_error_message_box(UiStrings().LiveBGError,