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

202 Commits

Author SHA1 Message Date
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Andreas Preikschat 1571cab0cf changed constructors 2013-07-18 16:19:01 +02:00
Andreas Preikschat 4b76db7ad7 convert bytes to str 2013-04-03 12:54:11 +02:00
Andreas Preikschat a6d966d1d2 changed comment 2013-04-03 12:40:09 +02:00
Andreas Preikschat 74eb0b59fb fixed LooseVersion not working 2013-04-03 12:39:42 +02:00
Andreas Preikschat 60cf33f23c fixed vlc.py not working 2013-03-26 21:22:15 +01:00
Tim Bentley 90d0d3c133 More updates 2013-03-23 07:28:24 +00:00
Tim Bentley decdf96ce1 More update 2013-03-23 07:07:06 +00:00
Andreas Preikschat eeb3061cce fixed spelling 2013-03-14 13:15:43 +01:00
Andreas Preikschat 59a06905fc added vlc version to exception form 2013-03-14 11:46:19 +01:00
Andreas Preikschat 14b61cabf4 renamed canFolder 2013-03-07 00:00:57 +01:00
Andreas Preikschat e1f35e002a some media renames 2013-03-06 23:54:16 +01:00
Tim Bentley 188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00
Tim Bentley ffb10c0149 More cleanups of slide controller and friends 2013-02-20 20:43:20 +00:00
Andreas Preikschat c8a84969cc fixed log verbosity 2013-02-20 10:03:53 +01:00
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Tim Bentley a9a4c7938e Fix name and other bugs 2013-02-03 19:23:12 +00:00
Tim Bentley b83b6eccd1 Head and merge failures 2013-02-03 16:40:39 +00:00
Tim Bentley 27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
Raoul Snyman e25326512d Now all the media players are looking better 2013-02-02 08:32:29 +02:00
Andreas Preikschat e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Tim Bentley edb7660bc0 Fix rougue events being generated 2013-01-19 12:50:52 +00:00
Tim Bentley f2ef685cf1 tidy ups 2013-01-16 19:35:44 +00:00
Andreas Preikschat 2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Tim Bentley 9f7725573d Fix tests 2013-01-09 19:56:16 +00:00
Tim Bentley feef9df575 Head 2013-01-02 21:50:45 +00:00
Tim Bentley 44a9f96c87 merge fixes 2012-12-30 19:49:48 +00:00
Tim Bentley e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley 01de9a93df Capture key and mouse movements 2012-12-29 20:54:25 +00:00
Andreas Preikschat b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Tim Bentley b1f80c96ea Fix media starting in wrong place 2012-12-21 19:11:00 +00:00
Andreas Preikschat 18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat 6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Tim Bentley cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley 68ce73544a volume fixes 2012-12-13 18:55:11 +00:00
Tim Bentley 0f0b8d04e7 Core Media to 120 2012-12-11 19:55:47 +00:00
Tim Bentley 3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Andreas Preikschat cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat 9b1709963e Change defaults for display screen mouse hiding 
bzr-revno: 2122
 2012-12-05 06:13:34 +00:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 4eab1a6521 Head 2012-11-22 21:58:16 +00:00
Raoul Snyman 85920b2132 Added .m4v to list of allowed VLC extensions. 2012-11-20 15:04:46 +02:00
Tim Bentley 57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
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 54fac2266e Merge with trunk. 2012-11-06 12:54:51 +01:00
Tim Bentley f155b51467 Head 2099 2012-11-03 20:53:30 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01: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 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
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 e24c588df3 Head 2012-10-25 20:17:14 +01: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 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
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
Tim Bentley 436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley a9dd3336fb Move media files around 2012-09-09 07:06:44 +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
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 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 fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat 49cd100f90 clean up 2012-05-19 17:41:05 +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 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 cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
rimach 09e7e16b12 fix issue, that video slider doesnt go back at video end 2012-03-13 20:54:16 +01: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
Mattias Põldaru 67cd90d5bf Don't translate player names. Added some keyboard shortcuts. 2012-03-09 08:09:19 +02:00
Mattias Põldaru 1600e002cb Make media backend names translatable. 
Fixes: https://launchpad.net/bugs/903683
 2012-03-05 23:09:31 +02:00
M2j b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01: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 1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +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 2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
rimach 11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach 870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach 087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00