raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused varable

This commit is contained in:
Tim Bentley 2012-09-29 19:58:18 +01:00
parent ee126c9924
commit d58efe2282
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/media/mediacontroller.py
View File

@ -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

2
openlp/core/ui/slidecontroller.py
View File

@ -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()