Merge lp:~meths/openlp/trivialfixes into lp:openlp

[Jon Tibble]

[Tim Bentley (trb143)]

Approved

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

[lp:~meths/openlp/trivialfixes]

544. By Jon Tibble on 2009-09-16

Merged in lp:~meths/openlp/trivialfixes

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2009-09-14 22:10:08 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2009-09-15 21:59:20 +0000
@@ -25,12 +25,6 @@
 import logging
 import os
 import tempfile
-try:
-    import gst
-except:
-    NOGST = True
-    log = logging.getLogger(u'MediaMediaItemSetup')
-    log.warning(u'Can\'t generate Videos previews - import gst failed');
 
 from PyQt4 import QtCore, QtGui
 
@@ -70,54 +64,17 @@
         MediaManagerItem.__init__(self, parent, icon, title)
 
     def video_get_preview(self, filename):
-        if NOGST:
-            #
-            # For now cross platform is an icon.  Phonon does not support
-            # individual frame access  (yet?) and GStreamer is not available
-            # on Windows
-            #
-            image = QtGui.QPixmap(u':/media/media_video.png').toImage()
-            return image
-        else:
-            """
-            Gets a preview of the first frame of a video file using GSTREAMER
-            (non-portable) - returns a QImage
-            """
-            try:
-                # Define your pipeline, just as you would at the command
-                # prompt.  This is much easier than trying to create and link
-                # each gstreamer element in Python.  This is great for
-                # pipelines that end with a filesink (i.e. there is no audible
-                # or visual output)
-                log.info ("Video preview %s"%( filename))
-                outfile = tempfile.NamedTemporaryFile(suffix='.png')
-                cmd = u'filesrc location="%s" ! decodebin ! ffmpegcolorspace ! pngenc ! filesink location="%s"'% (filename, outfile.name)
-                pipe = gst.parse_launch(cmd)
-                # Get a reference to the pipeline's bus
-                bus = pipe.get_bus()
-
-                # Set the pipeline's state to PLAYING
-                pipe.set_state(gst.STATE_PLAYING)
-
-                # Listen to the pipeline's bus indefinitely until we receive a
-                # EOS (end of stream) message.  This is a super important step,
-                # or the pipeline might not work as expected.  For example, in
-                # my example pipeline above, the pngenc will not export an
-                # actual image unless you have this line of code.  It just
-                # exports a 0 byte png file.  So... don't forget this step.
-                bus.poll(gst.MESSAGE_EOS, -1)
-                img = QtGui.QImage(outfile.name)
-                outfile.close()
-#             os.unlink(outfile.name)
-                pipe.set_state(gst.STATE_NULL)
-                return img
-            except:
-                log.info("Can't generate video preview for some reason");
-                return None
+        #
+        # For now cross platform is an icon.  Phonon does not support
+        # individual frame access (yet?) and GStreamer is not available
+        # on Windows
+        #
+        image = QtGui.QPixmap(u':/media/media_video.png').toImage()
+        return image
 
     def generateSlideData(self, service_item):
         indexes = self.ListView.selectedIndexes()
-        if len(items) > 1:
+        if len(indexes) > 1:
             return False
         service_item.title = u'Media'
         for index in indexes:
@@ -151,7 +108,7 @@
             row = self.ListView.row(item)
             self.ListView.takeItem(row)
             self.parent.config.set_list(
-                self.ConfigSection, self.ListData.getFileList())
+                self.ConfigSection, self.getFileList())
 
     def loadList(self, list):
         for file in list: