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

revert openlp/core/ui/media/mediacontroller.py to prevent merge conflict

Browse Source
This commit is contained in:
M2j 2012-05-01 13:03:31 +02:00
parent 41402ab078
commit eafd3a20ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ class MediaController(object):
invalidMediaPlayers = [mediaPlayer for mediaPlayer in savedPlayers \ invalidMediaPlayers = [mediaPlayer for mediaPlayer in savedPlayers \
if not mediaPlayer in self.mediaPlayers or \ if not mediaPlayer in self.mediaPlayers or \
not self.mediaPlayers[mediaPlayer].check_available()] not self.mediaPlayers[mediaPlayer].check_available()]
if invalidMediaPlayers: if len(invalidMediaPlayers) > 0:
for invalidPlayer in invalidMediaPlayers: for invalidPlayer in invalidMediaPlayers:
savedPlayers.remove(invalidPlayer) savedPlayers.remove(invalidPlayer)
set_media_players(savedPlayers, overriddenPlayer) set_media_players(savedPlayers, overriddenPlayer)
@ -141,7 +141,7 @@ class MediaController(object):
Check if there is a running media Player and do updating stuff (e.g. Check if there is a running media Player and do updating stuff (e.g.
update the UI) update the UI)
""" """
if not self.curDisplayMediaPlayer: if len(self.curDisplayMediaPlayer.keys()) == 0:
self.timer.stop() self.timer.stop()
else: else:
for display in self.curDisplayMediaPlayer.keys(): for display in self.curDisplayMediaPlayer.keys():