From 1d9425c3b7b2d062f7abb7755eaec032f562014b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 6 Mar 2013 23:50:49 +0100
Subject: [PATCH] renamed videoBehindText

---
 openlp/core/ui/media/mediacontroller.py | 6 +++---
 openlp/plugins/media/lib/mediaitem.py   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index cd60fc093..a0158cdb6 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -359,7 +359,7 @@ class MediaController(object):
         """
         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
 
@@ -372,7 +372,7 @@ class MediaController(object):
         ``hidden``
             The player which is doing the playing
 
-        ``videoBehindText``
+        ``video_behind_text``
             Is the video to be played behind text.
         """
         log.debug(u'video')
@@ -382,7 +382,7 @@ class MediaController(object):
         self.media_reset(controller)
         controller.media_info = MediaInfo()
         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())
         display = self._define_display(controller)
         if controller.is_live:
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index d5e9fa77a..106174147 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -152,8 +152,7 @@ class MediaMediaItem(MediaManagerItem):
                 service_item.shortname = service_item.title
                 (path, name) = os.path.split(filename)
                 service_item.add_from_command(path, name,CLAPPERBOARD)
-                if self.media_controller.video(DisplayControllerType.Live, service_item,
-                        videoBehindText=True):
+                if self.media_controller.video(DisplayControllerType.Live, service_item, video_behind_text=True):
                     self.resetAction.setVisible(True)
                 else:
                     critical_error_message_box(UiStrings().LiveBGError,