openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #18425
[Merge] lp:~trb143/openlp/media20 into lp:openlp/2.0
Tim Bentley has proposed merging lp:~trb143/openlp/media20 into lp:openlp/2.0.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/media20/+merge/141121
Fix for media
- Add 3 media items to service manager and start one
- Move position slider to any position and start the next
- New track starts at position of previous media item
- Start another track and restarts at wrong position again.
This should fix the bug by not excepting slider updates which starting a media item.
Fix for 999618
--
https://code.launchpad.net/~trb143/openlp/media20/+merge/141121
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/media20 into lp:openlp/2.0.
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2012-11-11 21:16:14 +0000
+++ openlp/core/ui/media/mediacontroller.py 2012-12-21 19:35:29 +0000
@@ -414,9 +414,13 @@
"""
log.debug(u'video_play')
controller = msg[0]
+ controller.seekSlider.blockSignals(True)
+ controller.volumeSlider.blockSignals(True)
for display in self.curDisplayMediaPlayer.keys():
if display.controller == controller:
if not self.curDisplayMediaPlayer[display].play(display):
+ controller.seekSlider.blockSignals(False)
+ controller.volumeSlider.blockSignals(False)
return False
if status:
display.frame.evaluateJavaScript(u'show_blank("desktop");')
@@ -428,6 +432,8 @@
# Start Timer for ui updates
if not self.timer.isActive():
self.timer.start()
+ controller.seekSlider.blockSignals(False)
+ controller.volumeSlider.blockSignals(False)
return True
def video_pause(self, msg):
Follow ups