Cleanups

openlp/core/ui/media/mediacontroller.py

@@ -47,12 +47,11 @@ class MediaController(object):
     """
 
     def __init__(self, parent):
-        print "Media Controller "
+        self.mainWindow = parent
-        print parent
-        self.parent = parent
         self.mediaPlayers = {}
         self.controller = []
         self.curDisplayMediaPlayer = {}
+        self.currentPlayer = None
         # Timer for video state
         self.timer = QtCore.QTimer()
         self.timer.setInterval(200)
@@ -259,8 +258,8 @@ class MediaController(object):
         # update player status
         self.set_active_players()
         display.hasAudio = True
-        if display == self.parent.previewController.previewDisplay or \
+        if display == self.mainWindow.previewController.previewDisplay or \
-            display == self.parent.liveController.previewDisplay:
+            display == self.mainWindow.liveController.previewDisplay:
             display.hasAudio = False
         for player in self.mediaPlayers.values():
             if player.isActive:
@@ -302,6 +301,7 @@ class MediaController(object):
         controller.media_info.file_info = QtCore.QFileInfo(serviceItem.get_filename())
         controller.media_info.is_background = isBackground
         display = None
+        #self.curDisplayMediaPlayer[u'current'] = serviceItem.name
         if controller.isLive:
             if controller.previewDisplay:
                 display = controller.previewDisplay
@@ -366,7 +366,6 @@ class MediaController(object):
         ``serviceItem``
             The ServiceItem containing the details to be played.
         """
-        print controller
         log.debug(u'media_length')
         # stop running videos
         self.video_reset(controller)
@@ -539,7 +538,7 @@ class MediaController(object):
         isLive = msg[1]
         if not isLive:
             return
-        controller = self.parent.liveController
+        controller = self.mainWindow.liveController
         for display in self.curDisplayMediaPlayer.keys():
             if display.controller != controller or \
                 self.curDisplayMediaPlayer[display].state != MediaState.Playing:
@@ -560,7 +559,7 @@ class MediaController(object):
         if not isLive:
             return
         Receiver.send_message(u'live_display_hide', hide_mode)
-        controller = self.parent.liveController
+        controller = self.mainWindow.liveController
         for display in self.curDisplayMediaPlayer.keys():
             if display.controller != controller or \
                 self.curDisplayMediaPlayer[display].state != MediaState.Playing:
@@ -580,7 +579,7 @@ class MediaController(object):
         isLive = msg[1]
         if not isLive:
             return
-        controller = self.parent.liveController
+        controller = self.mainWindow.liveController
         for display in self.curDisplayMediaPlayer.keys():
             if display.controller != controller or \
                 self.curDisplayMediaPlayer[display].state != MediaState.Paused:

openlp/core/ui/media/phononplayer.py

@@ -30,12 +30,16 @@ import logging
 import mimetypes
 from datetime import datetime
 
+from PyQt4 import QtCore, QtGui
 from PyQt4.phonon import Phonon
 
 from openlp.core.lib import Receiver
+from openlp.core.lib.settings import Settings
+
 from openlp.core.ui.media import MediaState
 from openlp.core.ui.media.mediaplayer import MediaPlayer
 
+
 log = logging.getLogger(__name__)
 
 ADDITIONAL_EXT = {
@@ -55,6 +59,20 @@ ADDITIONAL_EXT = {
         u'video/mpeg' : [u'.mp4', u'.mts'],
         u'video/x-ms-wmv': [u'.wmv']}
 
+VIDEO_CSS = u"""
+#videobackboard {
+    z-index:3;
+    background-color: %s;
+}
+#video1 {
+    background-color: %s;
+    z-index:4;
+}
+#video2 {
+    background-color: %s;
+    z-index:4;
+}
+"""
 
 class PhononPlayer(MediaPlayer):
     """
@@ -204,3 +222,11 @@ class PhononPlayer(MediaPlayer):
         if not controller.seekSlider.isSliderDown():
             controller.seekSlider.setSliderPosition(
                 display.mediaObject.currentTime())
+
+    def get_media_display_css(self):
+        """
+        Add css style sheets to htmlbuilder
+        """
+        background = unicode(QtGui.QColor(Settings().value(
+            u'players/background color', QtCore.QVariant(u'#000000'))).name())
+        return VIDEO_CSS % (background,background,background)

openlp/core/ui/slidecontroller.py

@@ -61,8 +61,6 @@ class Controller(QtGui.QWidget):
         Set up the general Controller.
         """
         QtGui.QWidget.__init__(self, parent)
-        print "Controller"
-        print parent
         self.isLive = isLive
         self.display = None