OpenLP

Merge lp://qastaging/~mikey74/openlp/dvdplayerfix into lp://qastaging/openlp

  1. dvdplayerfix
  2. Merge into trunk
Proposed by Mike
Status: Rejected
Rejected by: Tim Bentley
Proposed branch: lp://qastaging/~mikey74/openlp/dvdplayerfix
Merge into: lp://qastaging/openlp
Diff against target: 131 lines (+16/-16)
4 files modified
openlp/core/ui/media/mediacontroller.py (+4/-4)
openlp/core/ui/media/vlcplayer.py (+4/-4)
openlp/plugins/media/forms/mediaclipselectorform.py (+5/-5)
openlp/plugins/media/lib/mediaitem.py (+3/-3)
To merge this branch: bzr merge lp://qastaging/~mikey74/openlp/dvdplayerfix
Reviewer Review Type Date Requested Status
Raoul Snyman Needs Fixing
Review via email: mp+320253@code.qastaging.launchpad.net

Description of the change

Made minor changes to several files to get DVD playback working. Mostly had to do with how QTime is initiated: old QTime() -> new QTime(0, 0, 0) and then how milliseconds were being handled.

Once DVDs were playable, I noticed that if you paused a track and then hit the play button to resume playing it would start the track over again. This did not happen with media files which would pause and resume as expected. So I added a check to see if the media_state was paused for both the preview and live controllers, that would bypass the reinitializing of the DVD player.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Hi Mike,

Thanks for your contribution! As per our merge criteria, you need a test in order for this to be merged into trunk. Also, you only added the fix to trunk, not to the 2.4 line, so if you wanted to see it in 2.4.6 then you'll need to backport these changes to the 2.4 branch.

See the following links for more information:

  http://wiki.openlp.org/Development:Workflow#Run_Tests_Locally
  http://wiki.openlp.org/Development:Unit_Tests

review: Needs Fixing
Revision history for this message
Azaziah (suutari-olli) wrote :

This text is from:
https://bugs.launchpad.net/openlp/+bug/1673986

Mike (mikey74) wrote 51 minutes ago:

"Adding/Creating tests seems rather complicated. I am not really familiar with Python, so my venture into the code was limited to minor code changes. If someone wants to take the burden of completing the necessary tests, please feel free."

Revision history for this message
Tim Bentley (trb143) wrote :

Some how all this code is in trunk so not needed any more.

Unmerged revisions

2728. By Mike

fix issues with playing DVDs, bug #1514545

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.