From d88f437ffcb1021439dca2e3287410ffb8fc48a0 Mon Sep 17 00:00:00 2001
From: rimach <crichter@web.de>
Date: Thu, 22 Sep 2011 21:20:25 +0200
Subject: [PATCH] bugfixing

---
 openlp/core/ui/media/mediacontroller.py | 10 ++++++----
 openlp/core/ui/slidecontroller.py       | 17 -----------------
 openlp/plugins/media/lib/mediaitem.py   |  2 +-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index ee29675bc..be6e3ce52 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -278,10 +278,12 @@ class MediaController(object):
         if self.video_play([controller]):
             self.video_pause([controller])
             self.video_seek([controller, [0]])
-            if self.video_play([controller]):
-                self.set_controls_visible(controller, True)
-                log.debug(u'use %s controller' % self.curDisplayMediaAPI[display])
-                return True
+            if controller.isLive and  QtCore.QSettings().value(u'general/auto unblank',
+                QtCore.QVariant(False)).toBool():
+                self.video_play([controller])
+            self.set_controls_visible(controller, True)
+            log.debug(u'use %s controller' % self.curDisplayMediaAPI[display])
+            return True
         else:
             critical_error_message_box(
                 translate('MediaPlugin.MediaItem', 'Unsupported File'),
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 1e8e79b11..9818e1bae 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -269,23 +269,6 @@ class SlideController(Controller):
                 translate('OpenLP.SlideController', 'Pause audio.'),
                 self.onAudioPauseClicked, True)
             self.audioPauseItem.setVisible(False)
-            # Build the volumeSlider.
-            self.volumeSlider = QtGui.QSlider(QtCore.Qt.Horizontal)
-            self.volumeSlider.setTickInterval(1)
-            self.volumeSlider.setTickPosition(QtGui.QSlider.TicksAbove)
-            self.volumeSlider.setMinimum(0)
-            self.volumeSlider.setMaximum(10)
-        else:
-            # Build the seekSlider.
-            self.seekSlider = Phonon.SeekSlider()
-            self.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
-            self.seekSlider.setObjectName(u'seekSlider')
-            self.mediabar.addToolbarWidget(u'Seek Slider', self.seekSlider)
-            self.volumeSlider = Phonon.VolumeSlider()
-        self.volumeSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
-        self.volumeSlider.setObjectName(u'volumeSlider')
-        self.mediabar.addToolbarWidget(u'Audio Volume', self.volumeSlider)
-        self.controllerLayout.addWidget(self.mediabar)
         # Screen preview area
         self.previewFrame = QtGui.QFrame(self.splitter)
         self.previewFrame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 406ace294..3bdc18847 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -213,7 +213,7 @@ class MediaMediaItem(MediaManagerItem):
             self.plugin.mediaController.video_reset(self.mediaController)
             if self.mediaLength > 0:
                 service_item.add_capability(
-                    ItemCapabilities.AllowsVariableStartTime)
+                    ItemCapabilities.HasVariableStartTime)
         else:
             return False
         service_item.media_length = self.mediaLength