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

more tidyups

This commit is contained in:
Tim Bentley 2012-10-31 18:27:24 +00:00
parent 6c121bda1a
commit 1145d661a5
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,10 +656,8 @@ class MediaController(object):
if not isLive:
return
controller = self.mainWindow.liveController
for display in self.currentMediaPlayer.keys():
if display.controller != controller or \
self.currentMediaPlayer[display].state != MediaState.Playing:
continue
display = self._define_display(controller)
if self.currentMediaPlayer[display].state == MediaState.Playing:
self.currentMediaPlayer[display].pause(display)
self.currentMediaPlayer[display].set_visible(display, False)
@ -677,10 +675,8 @@ class MediaController(object):
return
Receiver.send_message(u'live_display_hide', hide_mode)
controller = self.mainWindow.liveController
for display in self.currentMediaPlayer.keys():
if display.controller != controller or \
self.currentMediaPlayer[display].state != MediaState.Playing:
continue
display = self._define_display(controller)
if self.currentMediaPlayer[display].state == MediaState.Playing:
self.currentMediaPlayer[display].pause(display)
self.currentMediaPlayer[display].set_visible(display, False)
@ -697,10 +693,8 @@ class MediaController(object):
if not isLive:
return
controller = self.mainWindow.liveController
for display in self.currentMediaPlayer.keys():
if display.controller != controller or \
self.currentMediaPlayer[display].state != MediaState.Paused:
continue
display = self._define_display(controller)
if self.currentMediaPlayer[display].state != MediaState.Playing:
if self.currentMediaPlayer[display].play(display):
self.currentMediaPlayer[display].set_visible(display, True)
# Start Timer for ui updates
@ -715,6 +709,9 @@ class MediaController(object):
def _define_display(self, controller):
"""
Extract the correct display for a given controller
``controller``
Controller to be used
"""
if controller.isLive:
return controller.display