Commit Graph

3107 Commits

Author SHA1 Message Date
Jonathan Baecker
0cbad7bb08 fix indent 2019-09-10 09:10:46 +02:00
jb-alvarado
792a1957d5 change Features and Requirements, spelling 2019-09-09 20:27:36 +02:00
jb-alvarado
5474899567 Merge branch 'dev' of https://github.com/ffplayout/ffplayout-engine into dev 2019-09-09 20:09:21 +02:00
jb-alvarado
1bfdccfcac wrong indent 2019-09-09 20:09:18 +02:00
jb-alvarado
f472f84b6d wrong indent 2019-09-09 20:08:09 +02:00
Jonathan Baecker
5edf3893e5 check isclose aspect 2019-09-09 18:10:25 +02:00
Jonathan Baecker
9df39e3c1b validate json, add docstring 2019-09-09 16:13:18 +02:00
jb-alvarado
af0906988e remove copy mode, #29 2019-09-08 21:24:02 +02:00
Jonathan Baecker
2ee3934dac Merge branch 'master' into dev 2019-09-06 12:41:28 +02:00
Jonathan Baecker
74170f5c64 better formating 2019-09-06 12:03:46 +02:00
Jonathan Baecker
c842256bbc fix bracket position, fix eof handling 2019-09-06 12:02:11 +02:00
jb-alvarado
52393b546c update readme 2019-09-04 21:39:33 +02:00
jb-alvarado
f92369336e add apad and tpad (needs ffmpeg 4.2) 2019-09-04 21:27:38 +02:00
jb-alvarado
dcba17e5ca load folder in class 2019-09-03 21:14:40 +02:00
jb-alvarado
ba037e0c85 MediaProbe to get infos, more filtering for match output, fix folder arg 2019-09-01 22:42:00 +02:00
jb-alvarado
5f4be41da7 expose logo opacity and add info about progressive 2019-09-01 22:35:09 +02:00
jb-alvarado
70c4e6d48a add config argument 2019-08-21 21:35:18 +02:00
Jonathan Baecker
adcfbfb482 Merge branch 'master' of github.com:ffplayout/ffplayout-engine 2019-08-20 14:45:17 +02:00
Jonathan Baecker
2fc4513806 support config as argument 2019-08-20 14:45:05 +02:00
jb-alvarado
d293451857 random sort 2019-08-19 20:27:20 +02:00
Jonathan Baecker
e7ce224ef9 Merge branch 'dev' - suppor remote playlists 2019-08-19 14:26:13 +02:00
Jonathan Baecker
23c2d95c55 remove length check fix source string 2019-08-16 16:52:10 +02:00
Jonathan Baecker
d6644be1ef show timeshift 2019-08-16 16:00:59 +02:00
Jonathan Baecker
cb7cface2f fix type error when no start time is set 2019-08-16 15:56:41 +02:00
Jonathan Baecker
13e146e19c php parse ini don't like multiple lines 2019-08-15 15:17:51 +02:00
Jonathan Baecker
144a96ea64 change # to ; 2019-08-15 13:54:58 +02:00
Jonathan Baecker
f8c0eb1225 Merge branch 'master' of https://github.com/jb-alvarado/ffplayout-gui 2019-08-15 13:53:44 +02:00
Jonathan Baecker
f9a1828bb7 support new config and playlist format 2019-08-15 13:51:27 +02:00
Jonathan Baecker
7499ed9ae2 remove fill function 2019-08-15 13:51:11 +02:00
Jonathan Baecker
5ec80d90c1 fix handling of to short playlists 2019-08-14 11:31:51 +02:00
Jonathan Baecker
7ffca4efa0 fix 00:00:00.000 starttime 2019-08-14 10:37:58 +02:00
jb-alvarado
5a2a7532e9 fix time string 2019-08-13 21:41:10 +02:00
jb-alvarado
955e514d4f min python version 3.6 2019-08-12 15:15:51 +02:00
Jonathan Baecker
c52e17df83 merge with master 2019-08-12 14:30:47 +02:00
jb-alvarado
e448ca6c73 folder argument 2019-08-11 17:33:11 +02:00
jb-alvarado
0e7e4724fd add folder argument 2019-08-09 17:55:21 +02:00
jb-alvarado
d619cd3c8b fix overlay in copy mode, calculation pre bitrate, cleanup 2019-08-09 17:31:39 +02:00
jb-alvarado
be5e373fd1 don't bother user with bitrate and copy settings, expose aspect 2019-08-09 17:29:48 +02:00
jb-alvarado
54f69b02d8 Merge branch 'master' of https://github.com/ffplayout/ffplayout-engine 2019-08-04 21:48:05 +02:00
jb-alvarado
34b38c9491 cleanup code, fix: #21 2019-08-04 21:48:01 +02:00
jb-alvarado
7de4f96dc5 cleanup code 2019-08-04 21:47:01 +02:00
jb-alvarado
ed8cce9420 Merge pull request #24 from lavvy/correct_the_example_playlist_json
removed the ending commas
2019-08-04 21:39:58 +02:00
Uche Okonkwo
0b740a464d removed the ending commas 2019-08-04 12:03:03 -04:00
Jonathan Baecker
91ba298b59 fix error when source in playlist is empty 2019-07-31 10:10:26 +02:00
Jonathan Baecker
8f602441bb log to file/console option 2019-07-31 10:09:41 +02:00
jb-alvarado
c6f448f2ce check only length 2019-07-21 00:54:06 +02:00
Jonathan Baecker
2468fbcbaf change info about filler 2019-07-19 15:02:23 +02:00
Jonathan Baecker
21a7b9e08d loop filler clip, when playlist is not 24 hours long 2019-07-19 14:58:28 +02:00
Jonathan Baecker
457383ec83 remove custom refs 2019-07-19 14:49:33 +02:00
Jonathan Baecker
1a622484c8 remove begin in playlist and time_shift in config - is redundant 2019-07-19 12:49:01 +02:00