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

simplified

Browse Source
This commit is contained in:
Tim Bentley 2015-12-20 21:30:47 +00:00
parent 2ef0b3b210
commit 15f1b61fd4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,8 @@ from openlp.core.ui import DisplayControllerType
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
TICK_TIME = 200
class MediaSlider(QtGui.QSlider): class MediaSlider(QtGui.QSlider):
""" """
@ -97,7 +99,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
self.current_media_players = {} self.current_media_players = {}
# Timer for video state # Timer for video state
self.timer = QtCore.QTimer() self.timer = QtCore.QTimer()
self.timer.setInterval(200) self.timer.setInterval(TICK_TIME)
# Signals # Signals
self.timer.timeout.connect(self.media_state) self.timer.timeout.connect(self.media_state)
Registry().register_function('playbackPlay', self.media_play_msg) Registry().register_function('playbackPlay', self.media_play_msg)
@ -202,6 +204,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
self.current_media_players[source].update_ui(display) self.current_media_players[source].update_ui(display)
if self.current_media_players[source].state == MediaState.Playing: if self.current_media_players[source].state == MediaState.Playing:
any_active = True any_active = True
self.tick(self.display_controllers[source])
# There are still any active players - no need to stop timer. # There are still any active players - no need to stop timer.
if any_active: if any_active:
return return
@ -624,11 +627,12 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
:param controller: The Controller to be processed :param controller: The Controller to be processed
""" """
if controller.media_info.playing: if controller.media_info.playing:
print("AA " + controller.media_info.timer, controller.media_info.length) print(controller.media_info.timer, controller.media_info.length)
if controller.media_info.timer > controller.media_info.length: if controller.media_info.timer > controller.media_info.length:
controller.media_info.timer = controller.media_info.length controller.media_info.timer = controller.media_info.length
print("over") print("over")
controller.media_info.timer += 1000 self.media_stop(controller)
controller.media_info.timer += TICK_TIME
seconds = controller.media_info.timer // 1000 seconds = controller.media_info.timer // 1000
print(seconds) print(seconds)
minutes = seconds // 60 minutes = seconds // 60