lp:~crichter/openlp/media_rewrite

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 1810

Raoul Snyman: Approve on 2011-12-01

Tim Bentley: Approve on 2011-12-01

Jonathan Corwin: Pending requested 2011-12-01

Andreas Preikschat: Pending requested 2011-12-01

Diff: 3216 lines (+1924/-669)

18 files modified

openlp/core/lib/htmlbuilder.py (+3/-107)
openlp/core/lib/mediaplayer.py (+137/-0)
openlp/core/lib/plugin.py (+1/-1)
openlp/core/lib/renderer.py (+2/-2)
openlp/core/ui/__init__.py (+2/-2)
openlp/core/ui/maindisplay.py (+67/-208)
openlp/core/ui/mainwindow.py (+3/-0)
openlp/core/ui/media/__init__.py (+65/-0)
openlp/core/ui/media/mediacontroller.py (+576/-0)
openlp/core/ui/media/phononplayer.py (+201/-0)
openlp/core/ui/media/webkitplayer.py (+426/-0)
openlp/core/ui/slidecontroller.py (+70/-122)
openlp/plugins/media/lib/mediaitem.py (+125/-55)
openlp/plugins/media/lib/mediatab.py (+159/-29)
openlp/plugins/media/mediaplugin.py (+43/-48)
resources/forms/mediafilesdialog.ui (+0/-95)
resources/pyinstaller/hook-openlp.core.ui.media.py (+30/-0)
scripts/windows-builder.py (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #813995: opengl rendering

Wishlist

Fix Released

Link a bug report

Related blueprints

1500. By rimach on 2011-12-01

bugfixing

1499. By rimach on 2011-11-30

sync

1498. By rimach on 2011-11-30

add vlcmedia to pyinstaller hook

1497. By rimach on 2011-11-30

bugfixing

1496. By rimach on 2011-11-24

bugfixing

1495. By rimach on 2011-11-24

sync

1494. By rimach on 2011-11-12

rename media_player.py

1493. By rimach on 2011-11-11

bugfixing

1492. By rimach on 2011-11-11

sync

1491. By rimach on 2011-11-02

Head and bugfixing