OpenLP

Merge lp://qastaging/~trb143/openlp/media_state into lp://qastaging/openlp

  1. media_state
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2936
Merged at revision: 2857
Proposed branch: lp://qastaging/~trb143/openlp/media_state
Merge into: lp://qastaging/openlp
Diff against target: 3097 lines (+560/-1663)
22 files modified
.bzrignore (+1/-0)
openlp/core/common/settings.py (+10/-4)
openlp/core/lib/theme.py (+5/-0)
openlp/core/ui/media/__init__.py (+1/-0)
openlp/core/ui/media/mediacontroller.py (+71/-169)
openlp/core/ui/media/mediaplayer.py (+5/-3)
openlp/core/ui/media/mediatab.py (+148/-0)
openlp/core/ui/media/playertab.py (+0/-269)
openlp/core/ui/media/systemplayer.py (+0/-332)
openlp/core/ui/media/vlcplayer.py (+115/-114)
openlp/core/ui/screenstab.py (+1/-1)
openlp/core/ui/settingsform.py (+8/-5)
openlp/core/ui/slidecontroller.py (+97/-8)
openlp/core/ui/themeform.py (+2/-0)
openlp/core/ui/themewizard.py (+3/-1)
openlp/core/widgets/views.py (+4/-1)
openlp/plugins/media/lib/mediaitem.py (+4/-1)
openlp/plugins/media/lib/mediatab.py (+0/-73)
openlp/plugins/media/mediaplugin.py (+0/-13)
tests/functional/openlp_core/common/test_common.py (+2/-2)
tests/functional/openlp_core/ui/media/test_systemplayer.py (+0/-567)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+83/-100)
To merge this branch: bzr merge lp://qastaging/~trb143/openlp/media_state
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+365879@code.qastaging.launchpad.net

Commit message

VLC plays and handles missing live display gracefully. Preview still works.
Added experimental setting to remove UI incomplete stuff.
various bug fixes and improvments,

Description of the change

New merge request as being inconsistent.

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

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Linting passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

macOS tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Overall this looks good. There is some commented code that I think either need to be fixed or removed? Also, I noticed there's some code that deals with streaming on Windows and Linux, which I presume you'll need the macOS equivalent for. Is there any other code that you need the macOS equivalent for?

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

This is work in progress and needs 1 more merge to finish.
The commented our code is not needed and needs to be cleaned up but want to keep till I finish.
The stream code is the next set and I have infor for linux and windows but not mac. Did ask the mailing list and only tgc responded.

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Some scrubbing on the nets found this:

  avcapture://

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

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.