html cleanup - text over video works

openlp/core/lib/htmlbuilder.py

@@ -102,6 +102,7 @@ def build_html(item, screen, alert):
                       build_image(width, height),
                       build_blank(width, height),
                       build_image_src(item.bg_frame))
+    print html
     return html
 
 def build_video(width, height):
@@ -114,14 +115,8 @@ def build_video(width, height):
         Screen height
     """
     video = """
-    #video {
-        position: absolute;
-        left: 0px;
-        top: 0px;
-        width: %spx
-        height: %spx;
-        z-index:1;
-    }
+    #video { position: absolute; left: 0px; top: 0px;
+        width: %spx; height: %spx; z-index:1; }
     """
     return video % (width, height)
 
@@ -139,7 +134,7 @@ def build_blank(width, height):
         position: absolute;
         left: 0px;
         top: 0px;
-        width: %spx
+        width: %spx;
         height: %spx;
         z-index:10;
     }
@@ -170,7 +165,7 @@ def build_image(width, height):
 def build_image_src(image):
     #    <img src="" height="480" width="640" />
     image_src = """
-    <img src="data:image/png;base64,%s">";
+    <img src="data:image/png;base64,%s">
     """
     return image_src % image_to_byte(image)
 
@@ -267,14 +262,8 @@ def build_footer(item):
 
 def build_alert(width, alert):
     alert = """
-    #alert {
-        position: absolute;
-        left: 0px;
-        top: 70px;
-        width: %spx;
-        height: 10px;
-        z-index:4;
-        font-size: 50px;
+    #alert { position: absolute; left: 0px; top: 70px;
+        width: %spx; height: 10px; z-index:4; font-size: 50px;
     }
     #alert p {
         background-color: red;

openlp/core/lib/rendermanager.py

@@ -188,7 +188,7 @@ class RenderManager(object):
         footer.append(u'CCLI 123456')
         # build a service item to generate preview
         serviceItem = ServiceItem()
-        serviceItem.add_from_text(u'', verse, u'')
+        serviceItem.add_from_text(u'', verse, footer)
         serviceItem.render_manager = self
         # serviceItem gets the theme data so switch it.
         temp_themedata = self.themedata

openlp/core/ui/maindisplay.py

@@ -368,4 +368,4 @@ class AudioPlayer(QtCore.QObject):
         Clean up the Object queue
         """
         log.debug(u'AudioPlayer Reached end of media playlist')
-        self.mediaObject.clearQueue()
+        self.mediaObject.clearQueue()

openlp/core/ui/slidecontroller.py

@@ -549,8 +549,6 @@ class SlideController(QtGui.QWidget):
                     self.serviceItem.name.lower(), [serviceItem, self.isLive])
             if self.serviceItem.is_media():
                 self.onMediaStop()
-        if serviceItem.is_media():
-            self.onMediaStart(serviceItem)
         if self.isLive:
             blanked = self.BlankScreen.isChecked()
         else:
@@ -561,7 +559,7 @@ class SlideController(QtGui.QWidget):
         width = self.parent.ControlSplitter.sizes()[self.split]
         # Set pointing cursor when we have somthing to point at
         self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
-        #Clear the old serviceItem cache to release memory
+        # Clear the old serviceItem cache to release memory
 #        if self.serviceItem and self.serviceItem is not serviceItem:
 #            self.serviceItem.clear_cache()
         self.serviceItem = serviceItem
@@ -618,6 +616,8 @@ class SlideController(QtGui.QWidget):
         self.enableToolBar(serviceItem)
         # Pass to display for viewing
         self.display.buildHtml(self.serviceItem)
+        if serviceItem.is_media():
+            self.onMediaStart(serviceItem)
         self.onSlideSelected()
         self.PreviewListWidget.setFocus()
         Receiver.send_message(u'slidecontroller_%s_started' % self.typePrefix,
@@ -947,7 +947,9 @@ class SlideController(QtGui.QWidget):
         """
         log.debug(u'SlideController onMediaStart')
         if self.isLive:
-            Receiver.send_message(u'videodisplay_start', item)
+            file = os.path.join(item.get_frame_path(), item.get_frame_title())
+            self.display.video(file)
+            #Receiver.send_message(u'videodisplay_start', item)
         else:
             self.mediaObject.stop()
             self.mediaObject.clearQueue()

openlp/plugins/media/lib/mediaitem.py

@@ -115,7 +115,7 @@ class MediaMediaItem(MediaManagerItem):
             'You must select a media file to replace the background with.')):
             item = self.listView.currentItem()
             filename = unicode(item.data(QtCore.Qt.UserRole).toString())
-            self.parent.displayManager.displayVideo(filename)
+            self.parent.liveController.display.video(filename)
         self.resetButton.setVisible(True)
 
     def generateSlideData(self, service_item, item=None):
@@ -159,4 +159,4 @@ class MediaMediaItem(MediaManagerItem):
             img = QtGui.QPixmap(u':/media/media_video.png').toImage()
             item_name.setIcon(build_icon(img))
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
-            self.listView.addItem(item_name)
+            self.listView.addItem(item_name)