raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,261 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

343 Commits

Author SHA1 Message Date
Tim Bentley 69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Tim Bentley 2295a74d5d Head 2104 - reverse some changes as not valid in this release 2012-11-07 18:47:56 +00:00
Martin Zibricky 5c82a0c3dd Bug #963955 : Rename controllersVisible to controlsVisible. 2012-11-06 12:58:32 +01:00
Martin Zibricky 54fac2266e Merge with trunk. 2012-11-06 12:54:51 +01:00
Tim Bentley 751246ce0c Merge cleanups 2012-11-04 20:11:10 +00:00
Tim Bentley f155b51467 Head 2099 2012-11-03 20:53:30 +00:00
Tim Bentley 8cd8d07d2c missing rename 2012-11-01 18:57:07 +00:00
Tim Bentley 6047657741 cleanups and minor fixes 2012-11-01 18:45:12 +00:00
Tim Bentley a91dc027d2 Documentation 2012-11-01 16:54:37 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley 1145d661a5 more tidyups 2012-10-31 18:27:24 +00:00
Tim Bentley 6c121bda1a Api simplifications and removal of unneeded variables 2012-10-31 18:04:24 +00:00
Tim Bentley 29ec487d58 Remove old controller stack 2012-10-30 19:38:48 +00:00
Tim Bentley 5b7b2ecfb9 Api clean up 2012-10-29 16:54:39 +00:00
Tim Bentley a1bd9013cb Reference tidy up 2012-10-29 17:25:08 +00:00
Erik Lundin 48e2ac108d Fixed bug #1072498 'VLC: Add webm as supported format' 
Fixes: https://launchpad.net/bugs/1072498
 2012-10-29 00:08:54 +01:00
Tim Bentley a106244aba Zeoo Vol for preview and fix start / stop buttons 2012-10-28 22:00:28 +00:00
Martin Zibricky b414177fc3 Merge with trunk. 2012-10-27 20:14:01 +02:00
Martin Zibricky 064a318f9a Bug #963955: Disable audio for video preview. 2012-10-27 19:32:56 +02:00
Martin Zibricky e6cc675207 Bug #963955: Fix the video progress bar. 2012-10-27 19:04:54 +02:00
Martin Zibricky b5de3c2828 Bug #963955: Avoid the need to start video twice to just get media length. 2012-10-27 16:52:51 +02:00
Tim Bentley f645ab962c Api cleanup 2012-10-26 21:20:23 +01:00
Tim Bentley a5fc3ea3f7 Fix bug 2012-10-25 22:03:12 +01:00
Tim Bentley 90a3493d89 Clean up video api 2012-10-25 21:33:28 +01:00
Tim Bentley 34b4828c30 convert video api to registered controller 2012-10-25 20:38:12 +01:00
Tim Bentley e24c588df3 Head 2012-10-25 20:17:14 +01:00
Tim Bentley a997bfa001 Fix player selection and simplify media_length 2012-10-25 20:16:56 +01:00
Martin Zibricky e1cd3bdd8b Allow .mov videos in phonon backend. 2012-10-21 22:42:51 +02:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Tim Bentley 8e5dafb715 Fix bugs and more simplifications 2012-10-20 20:52:04 +01:00
Tim Bentley 464480fc34 fix up settings tab 2012-10-18 21:38:01 +01:00
Tim Bentley 057a1fe415 Rename methods 2012-10-15 19:38:58 +01:00
Tim Bentley 8fb1ede03f Media Players help text 2012-10-15 18:35:14 +01:00
Martin Zibricky 869d1c6fd7 Merge with trunk. 2012-10-14 20:53:07 +02:00
Tim Bentley aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Tim Bentley 77ddd4f385 Fixes 2012-10-13 21:54:56 +01:00
Andreas Preikschat cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Tim Bentley c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01:00
Olivier Aubert 4a5b845cd0 updated from master 2012-10-08 17:44:42 +02:00
Tim Bentley 34284ea8ae Clean up media extension lists and move the controller. Fix reload of suffixes to happen after media or presentaions changes 2012-10-07 08:25:55 +01:00
Tim Bentley 56501b69f7 Head 2074 2012-10-06 09:37:40 +01:00
Tim Bentley 66728c52cd Renames 2012-10-06 09:35:37 +01:00
Tim Bentley 2dadfbd17a More Code cleanups 2012-10-06 09:10:28 +01:00
Tim Bentley e141ff1c24 Cleanups 2012-10-04 21:12:09 +01:00
Tim Bentley 45849803aa Cleanups 2012-10-04 18:28:49 +01:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat f375d4b0b8 fixed bug 1050081 'display screen - hide mouse by default' 
Fixes: https://launchpad.net/bugs/1050081
 2012-10-03 13:27:28 +02:00
Andreas Preikschat afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +02:00
Tim Bentley d58efe2282 Remove unused varable 2012-09-29 19:58:18 +01:00
Tim Bentley ee126c9924 Change background color of video 2012-09-29 19:36:30 +01:00
Tim Bentley a3e41b1ee7 Fix video injection and have black backgrounds 2012-09-29 17:27:55 +01:00
Andreas Preikschat e1707c4203 updated vlc.py from master 
bzr-revno: 2067
 2012-09-20 07:19:56 +02:00
Andreas Preikschat 0a98901ab2 updated vlc.py 2012-09-19 08:34:45 +02:00
Martin Zibricky ba37730538 Remove cheching for non-existing file in media player code. 2012-09-15 18:47:14 +02:00
Tim Bentley 436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley c8f54a44ae Titles 2012-09-15 15:27:09 +01:00
Martin Zibricky 35bed5d11b Fix #963894: Put warning about disabled vlc to openlp.log. 2012-09-15 13:29:55 +02:00
Martin Zibricky 292bae6924 Fix #963894: Put message about disabled vlc to openlp.log. 2012-09-15 13:26:42 +02:00
Martin Zibricky 803d6bbe98 Add some more comments. 2012-09-15 13:18:47 +02:00
Martin Zibricky 41980a3a46 Fix #963894: disable vlc backend completely for osx. 2012-09-15 13:16:58 +02:00
Martin Zibricky f51f19e2b9 Fix #963894: expect also OSError while checking for media backends. 2012-09-15 13:09:59 +02:00
Tim Bentley a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Tim Bentley 1df6934bda Refactor video length 2012-09-09 07:54:09 +01:00
Tim Bentley 6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Tim Bentley a9dd3336fb Move media files around 2012-09-09 07:06:44 +01:00
Tim Bentley 0a65493ce0 Fix video autoplay options 
bzr-revno: 2056
 2012-09-08 20:32:51 +01:00
Tim Bentley 51893b8052 tabs 2012-09-08 19:39:15 +01:00
Tim Bentley 77f49258f9 Fix duplicate ifs 2012-09-08 19:29:05 +01:00
Raoul Snyman ad39fa11e5 Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format) 2012-09-08 19:15:08 +02:00
Tim Bentley 59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley 6d53ed904b Fix extra line 2012-09-06 18:12:02 +01:00
Tim Bentley ed2d670f18 fix ups 2012-09-06 17:38:31 +01:00
Martin Zibricky 15d031eec1 Fix playback of videos with vlc in preview window on OSX. 2012-08-18 19:26:54 +02:00
Tim Bentley 9813e45bde VLC does support wva 2012-08-05 19:17:52 +01:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Raoul Snyman 6a688ab845 Catch a previously uncaught NotImplementedError. 
bzr-revno: 2000
Fixes: https://launchpad.net/bugs/1013215
 2012-06-19 15:03:24 +02:00
Andreas Preikschat 08adb54679 updated vlc.py 2012-06-15 17:31:24 +02:00
Raoul Snyman 0ad713407b Fixed bug #1013215: Catch a previously uncaught NotImplementedError and do nothing so that OpenLP realises that VLC is not available. 
Fixes: https://launchpad.net/bugs/1013215
 2012-06-14 23:20:55 +02:00
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Andreas Preikschat 6c981afedc - clean ups 
bzr-revno: 1984
 2012-06-09 20:28:07 +02:00
Andreas Preikschat fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat e8eb2e317d updated vlc.py 2012-06-09 15:46:34 +02:00
Andreas Preikschat 49cd100f90 clean up 2012-05-19 17:41:05 +02:00
Andreas Preikschat b0585297fb clean up 2012-05-19 17:30:09 +02:00
Andreas Preikschat 1fe4e0a56a removed toFloat() 2012-05-19 17:25:39 +02:00
Andreas Preikschat a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Andreas Preikschat b124481ea2 continued with QVariant 2012-05-19 11:13:32 +02:00
Andreas Preikschat e80287f591 fixed import 2012-05-17 22:19:07 +02:00
Andreas Preikschat cb13f805e4 clean up + fix 2012-05-17 22:06:23 +02:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat 4a979b49d9 continued to implement QString v2 api 2012-05-17 18:19:06 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Andreas Preikschat dbe85abb84 updated vlc.py 
bzr-revno: 1960
 2012-05-01 15:11:24 +02:00
Andreas Preikschat bd4cded398 updated vlc.py 2012-05-01 12:38:19 +02:00
Andreas Preikschat f6177c62b2 fixed LooseVersion usage 2012-04-28 18:22:37 +02:00
Andreas Preikschat 9668b22f85 shorter solution 2012-04-28 15:10:54 +02:00
Andreas Preikschat 9dc7d1a795 fixed cap 2012-04-28 14:28:38 +02:00
Andreas Preikschat 42bc12f3fb try to prevent traceback when vlc too old 
Fixes: https://launchpad.net/bugs/966086
 2012-04-28 14:27:18 +02:00
Andreas Preikschat 1869fd7593 fixed clean up mistake 2012-04-28 13:37:39 +02:00
Andreas Preikschat f01252c23b fixed missing word 2012-04-28 13:31:42 +02:00
Andreas Preikschat cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
rimach 210f0e693b little corrections 2012-03-21 20:30:18 +01:00
rimach 8a029daf11 Head 2012-03-20 22:21:47 +01:00
rimach 527f4cc00c change camelcase variables 2012-03-19 20:27:02 +01:00
Jon Tibble 086a32d7b1 Head r1908 2012-03-17 16:42:53 +00:00
rimach 360df826e1 correct overridden media option 2012-03-16 22:52:15 +01:00
rimach 7464d0f9fc correct pause check, correct signal names 2012-03-16 22:09:27 +01:00
rimach 09e7e16b12 fix issue, that video slider doesnt go back at video end 2012-03-13 20:54:16 +01:00
Jon Tibble 8e7eca36c7 Head r1903 2012-03-12 22:16:52 +00:00
Jon Tibble 9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Mattias Põldaru 9e4cdf1a74 Merge. 2012-03-12 10:25:48 +02:00
Mattias Põldaru f188e21391 Fix mediaPlayer override ComboBox items case. 2012-03-12 10:17:20 +02:00
Jonathan Corwin e3d523042b Fix a couple of spelling mistakes 
bzr-revno: 1897
 2012-03-10 23:00:14 +00:00
Christian Richter 69d961666c Media player configuration changes: 
Change the layout of the up/down buttons
Fix issue: if choose down button without selecting any item before the settings dialog were broken

bzr-revno: 1895
 2012-03-10 22:56:57 +00:00
Meinert Jordan 77b8f84ed2 Tidyups: 
Unify all QAction creation methods.
Derive OpenLPToolbar().actions keys from object names.
Use Python methods instead of Qt for file path manipulations.
Bug #943919: Shortcuts for "Move to Previous/Next" in live slide controller.

bzr-revno: 1894
 2012-03-10 22:50:38 +00:00
Jonathan Corwin e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +00:00
Mattias Põldaru 67cd90d5bf Don't translate player names. Added some keyboard shortcuts. 2012-03-09 08:09:19 +02:00
rimach 499f51bd2b change Button layout, fix issue if no item selected and choose down button 2012-03-08 23:14:59 +01:00
Mattias Põldaru 1600e002cb Make media backend names translatable. 
Fixes: https://launchpad.net/bugs/903683
 2012-03-05 23:09:31 +02:00
Jonathan Corwin e5a316ba2d Transparency fixes 2012-03-05 19:40:16 +00:00
M2j 9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
M2j b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01:00
rimach 5d6db957e1 fix 2012-03-03 23:36:46 +01:00
M2j 587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:52:57 +01:00
M2j 277de83b68 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:38:20 +01:00
rimach 87e70fa2dc fix 2012-03-03 00:08:24 +01:00
M2j 45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in 
case translators translate different strings same.
 2012-03-02 13:11:13 +01:00
M2j 6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
Christian Richter 863a9f9129 Added VLC support to OpenLP 
bzr-revno: 1874
 2012-02-05 16:39:46 +02:00
Jonathan Stafford 312a02f14b Fixed typo 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:51:25 +08:00
Jonathan Stafford 7b180a4c67 Fixed bug #900727: Phonon backend no longer plays .mp4 video files 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:46:17 +08:00
rimach 88ce7a906d reactivate vlc 2012-01-19 20:13:19 +01:00
rimach edf4ac75c8 move phonon and vlc to own windows 2012-01-12 22:45:07 +01:00
rimach 3e6d1e7962 update vlc code 2012-01-11 21:51:11 +01:00
rimach b834371d5c Sync with head 2012-01-09 22:30:31 +01:00
Jon Tibble e1a4837a19 Long line 2011-12-31 17:36:23 +00:00
M2j cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01:00
rimach 1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01:00
rimach f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +01:00
rimach b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
rimach bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
rimach 2df4a1903e bugfixing 2011-12-05 19:48:32 +01:00
rimach ae5998e2dc sync 2011-12-05 18:43:54 +01:00
Andreas Preikschat b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
rimach 8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
rimach 2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
Jon Tibble e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
rimach 11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach 4fc4bacfa7 bugfixing 2011-12-01 19:08:12 +01:00
rimach e627960391 bugfixing 2011-12-01 19:07:15 +01:00
rimach 44d71dcee7 bugfixing 2011-11-30 18:10:57 +01:00
rimach 58035f505d bugfixing 2011-11-30 18:06:57 +01:00
rimach d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01:00
rimach 870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach 087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach 4779a3f21a Head and bugfixing 2011-11-02 21:44:44 +01:00
rimach 2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
rimach 01ff00dcf9 bugfixing and sync 2011-10-26 22:13:30 +02:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
rimach 2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +02:00
rimach 3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach c299efab1a update 2011-09-28 22:54:43 +02:00
rimach 81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach 18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
rimach 709037ccca review changes part 2 and Head 2011-08-30 18:58:12 +02:00
rimach 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach 169f8a2942 review changes 2011-08-29 23:52:26 +02:00
rimach c608301b0b review changes 2011-08-29 23:51:03 +02:00
rimach d7f4298fbb bugfixing and Head 2011-08-29 21:59:12 +02:00
rimach c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
rimach d64d22533f preview issue fixed, sync with trunk 2011-08-23 22:29:11 +02:00
rimach 565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
rimach crichter@web.de 2e69c00cf1 resolve volume settings problem in phononapi 2011-07-28 22:50:20 +02:00
rimach crichter@web.de f1d7284e8d resolve volume settings problem in phononapi 2011-07-28 22:49:43 +02:00
rimach crichter@web.de 9af26bac34 fix media loading in Service bug, sync with trunk 2011-07-28 22:36:19 +02:00
rimach crichter@web.de ea7e03406c fix loading media in Service bug 2011-07-28 22:34:20 +02:00
rimach crichter@web.de 4cb65187e7 add Starttime to phonon api and sync with trunk 2011-07-25 23:10:25 +02:00
rimach crichter@web.de 1c63ef3ea1 add starttime for python and vlc 2011-07-25 22:56:39 +02:00
rimach crichter@web.de f1463a4467 bugfixing 2011-07-20 23:17:05 +02:00
rimach crichter@web.de c61f23370c bugfixing 2011-07-20 23:16:36 +02:00
rimach crichter@web.de 45dfb28c54 update 2011-07-19 22:04:32 +02:00
rimach crichter@web.de 65e6d45eff further changes 2011-07-18 23:25:10 +02:00
rimach crichter@web.de 98e1028705 update 2011-07-10 23:43:07 +02:00