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

Remove old controller stack

This commit is contained in:
Tim Bentley 2012-10-30 19:38:48 +00:00
parent 5b7b2ecfb9
commit 29ec487d58
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,6 @@ class MediaController(object):
def __init__(self, parent): def __init__(self, parent):
self.mainWindow = parent self.mainWindow = parent
self.mediaPlayers = {} self.mediaPlayers = {}
self.controller = []
self.displayControllers = {} self.displayControllers = {}
self.curDisplayMediaPlayer = {} self.curDisplayMediaPlayer = {}
# Timer for video state # Timer for video state
@ -234,7 +233,6 @@ class MediaController(object):
The controllers toolbar where the widgets reside The controllers toolbar where the widgets reside
""" """
self.displayControllers[source] = controller self.displayControllers[source] = controller
self.controller.append(controller)
self.setup_generic_controls(controller, control_panel) self.setup_generic_controls(controller, control_panel)
def setup_generic_controls(self, controller, control_panel): def setup_generic_controls(self, controller, control_panel):
@ -720,8 +718,8 @@ class MediaController(object):
def finalise(self): def finalise(self):
self.timer.stop() self.timer.stop()
for controller in self.controller: for controller in self.displayControllers:
self.media_reset(controller) self.media_reset(self.displayControllers[controller])
def _define_display(self, controller): def _define_display(self, controller):
""" """

2
openlp/core/ui/media/vlcplayer.py
View File

@ -179,7 +179,7 @@ class VlcPlayer(MediaPlayer):
controller = display.controller controller = display.controller
print controller print controller
start_time = 0 start_time = 0
if self.state != MediaState.Paused and\ if self.state != MediaState.Paused and \
controller.media_info.start_time > 0: controller.media_info.start_time > 0:
start_time = controller.media_info.start_time start_time = controller.media_info.start_time
display.vlcMediaPlayer.play() display.vlcMediaPlayer.play()