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
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