Merge lp:~tomasgroth/openlp/bugfixes17 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2530 |
Merged at revision: | 2524 |
Proposed branch: | lp:~tomasgroth/openlp/bugfixes17 |
Merge into: | lp:openlp |
Diff against target: |
206 lines (+65/-40) 6 files modified
openlp/core/ui/media/mediacontroller.py (+3/-3) openlp/core/ui/media/vlcplayer.py (+26/-31) openlp/core/ui/media/webkitplayer.py (+1/-1) openlp/core/ui/slidecontroller.py (+7/-2) openlp/plugins/presentations/lib/mediaitem.py (+2/-1) tests/functional/openlp_plugins/presentations/test_mediaitem.py (+26/-2) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/bugfixes17 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+253448@code.launchpad.net |
Description of the change
Insert timeout on acquiring lock in slidecontroller to avoid hang. Fixes bug 1413324.
Run XInitThreads when using VLC to make it work correctly. Fixes bug 1433245.
Disable the stop button in the slidecontroller mediaplayer buttons instead of hiding it to stop the position and audio slider resizing. Fixes bug 1431478.
Fixed a webkit player exception. Fixes bug 1431476.
Fix crash if presentation file in the mediamanger was removed bewteen sessions. Fixes bug 1432418.
Updated the list of extensions supported by VLC.
To post a comment you must log in.
lp:~tomasgroth/openlp/bugfixes17 (revision 2530) ci.openlp. io/job/ Branch- 01-Pull/ 994/ ci.openlp. io/job/ Branch- 02-Functional- Tests/917/ ci.openlp. io/job/ Branch- 03-Interface- Tests/859/ ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/748/ ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/347/ ci.openlp. io/job/ Branch- 05a-Code_ Analysis/ 484/ ci.openlp. io/job/ Branch- 05b-Test_ Coverage/ 355/
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//
[SUCCESS] https//