From d58efe2282c8cd2efd0267c3eb283597bd3465dc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 29 Sep 2012 19:58:18 +0100 Subject: [PATCH] Remove unused varable --- openlp/core/ui/media/mediacontroller.py | 6 +----- openlp/core/ui/slidecontroller.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 4677b1396..0a66da681 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -56,7 +56,6 @@ class MediaController(object): # Timer for video state self.timer = QtCore.QTimer() self.timer.setInterval(200) - self.withLivePreview = False self.check_available_media_players() # Signals QtCore.QObject.connect(self.timer, @@ -260,9 +259,6 @@ class MediaController(object): # update player status self.set_active_players() display.hasAudio = True - if not self.withLivePreview and \ - display == self.parent.liveController.previewDisplay: - return if display == self.parent.previewController.previewDisplay or \ display == self.parent.liveController.previewDisplay: display.hasAudio = False @@ -307,7 +303,7 @@ class MediaController(object): controller.media_info.is_background = isBackground display = None if controller.isLive: - if self.withLivePreview and controller.previewDisplay: + if controller.previewDisplay: display = controller.previewDisplay isValid = self.check_file_type(controller, display) display = controller.display diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index aee409ed9..fe407b84f 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1349,7 +1349,7 @@ class SlideController(Controller): """ log.debug(u'SlideController onMediaStart') self.mediaController.video(self, item, False, False, self.hideMode()) - if not self.isLive or self.mediaController.withLivePreview: + if not self.isLive: self.previewDisplay.show() self.slidePreview.hide()