412 Commits

Author SHA1 Message Date
vexorian
cf4a60cd91 Prepare 1.2.5 development 2021-02-28 23:05:46 -04:00
vexorian
f239a18a0b
Merge pull request #260 from vexorian/20210215_dev
20210215 dev
2021-02-15 10:10:52 -04:00
vexorian
d39be13bf2 4 hours rerun blocks 2021-02-15 10:06:57 -04:00
vexorian
47b2fe8dd4 Max time for last-played is 7 days up from 24. I think this makes flex work nicer when the dizquetv session is long. But it's subjective. 2021-02-15 10:06:10 -04:00
vexorian
6c88a9f414
Merge pull request #246 from vexorian/20210121_dev
Fix enabling watermark not always loading the defaults.
2021-01-21 23:55:43 -04:00
vexorian
027e9faaa8 Fix enabling watermark not always loading the defaults. 2021-01-21 23:54:19 -04:00
vexorian
a29c1ce8dc
Merge pull request #240 from vexorian/20210117_dev
20210117 dev
2021-01-17 16:12:12 -04:00
vexorian
c7703a2b77 Try to play error stream when offline stream fails 2021-01-17 16:10:05 -04:00
vexorian
4c3e8f8d83 Use correct input file indexes in offline filters. Fix white noise, beep sometimes not making a sound at all. 2021-01-17 16:10:05 -04:00
vexorian
c495a5ae36 Fix typo in logs. 2021-01-17 16:10:05 -04:00
vexorian
62cf02addf
Merge pull request #238 from vexorian/20210116_dev
Visual Update
2021-01-16 15:18:24 -04:00
vexorian
f6537bad61 Visual Update 2021-01-16 15:15:17 -04:00
vexorian
6da809a57f
Merge pull request #237 from rafaelvieiras/fix/direct-play
Fixed Direct Play with Transcoding
2021-01-16 15:12:56 -04:00
Rafael Vieira
f0ad76b76c Fixed Direct Play with Transcoding 2021-01-15 17:28:03 -03:00
vexorian
52af53eed9 Prepare 1.2.4 development 2021-01-10 19:01:59 -04:00
vexorian
41baddedba Update PR template to point to 1.3.x 2021-01-10 18:52:19 -04:00
vexorian
3661aa9aba
Merge pull request #227 from vexorian/20200110_main
1.2.3
1.2.3
2021-01-10 14:06:59 -04:00
vexorian
d0ac96acf4 Merge branch 'edge' into main 2021-01-10 14:04:24 -04:00
vexorian
ee50957974
Merge pull request #226 from vexorian/20200110_edge
1.2.3
2021-01-10 14:01:46 -04:00
vexorian
526b18275b 1.2.3 2021-01-10 13:57:46 -04:00
vexorian
9169ec65e3 Merge remote-tracking branch 'dev/1.2.x' into edge 2021-01-10 13:56:44 -04:00
vexorian
90e45ee707
Merge pull request #225 from vexorian/20200110_dev
Ability to change the scaling algorithm and default is now bicubic instead of fast_bilinear. Related to #116
2021-01-10 13:50:03 -04:00
vexorian
17e565ee6f Ability to change the scaling algorithm and default is now bicubic instead of fast_bilinear. Related to #116 2021-01-10 13:48:04 -04:00
vexorian
59253cd9ca
Merge pull request #224 from vexorian/20210109_dev
#212 add CUID tag to channels in the m3u
2021-01-09 23:32:44 -04:00
vexorian
2ac71e5864 #212 add CUID tag to channels in the m3u 2021-01-09 23:29:48 -04:00
vexorian
c30f5713ba
Merge pull request #223 from vexorian/20210109_dev
#185 : animated watermark causes stream to lock when switching between videos.
2021-01-09 20:20:29 -04:00
vexorian
1a26be30d6 #185 : animated watermark causes stream to lock when switching between videos. 2021-01-09 20:18:26 -04:00
vexorian
5fc2f7a00f
Merge pull request #222 from vexorian/20210109_dev
20210109 dev
2021-01-09 18:29:47 -04:00
vexorian
de4a80d39f #221 Fix ghost ffmpeg processes 2021-01-09 18:26:48 -04:00
vexorian
86d1329b8c Fix bug introduced with #219 , it wasn't reading a normal ffmpeg process' output 2021-01-09 18:26:15 -04:00
vexorian
a1ca124c5a
Merge pull request #220 from vexorian/20210109_dev
20210109 dev
2021-01-09 10:09:29 -04:00
vexorian
a3b74e8af5 #219 Better ffmpeg version handling. 2021-01-09 10:08:49 -04:00
vexorian
7bea25db75 Prepare 1.2.3 development 2021-01-09 10:08:38 -04:00
vexorian
1989f5ca83 1.2.2 1.2.2 2020-11-22 21:51:49 -04:00
vexorian
3762f032d3 Merge branch 'dev/1.2.x' into edge 2020-11-22 21:46:54 -04:00
vexorian
f428dbecf0 1.1.4 1.1.4 2020-11-22 21:20:44 -04:00
vexorian
d52f0adf87 Merge branch 'dev/1.1.x' into main 2020-11-22 21:19:24 -04:00
vexorian
1694a45721
Merge pull request #204 from vexorian/20201122_dev
20201122 dev
2020-11-22 21:17:37 -04:00
vexorian
e939ddb306 Merge branch 'dev/1.1.x' into dev/1.2.x 2020-11-22 21:16:17 -04:00
vexorian
c176afa8a4
Merge pull request #203 from vexorian/20201122_dev
Fix bug with remove duplicates making things break in the channel schedule editor until other tool is used.
2020-11-22 21:13:07 -04:00
vexorian
f5d073ddc1 Fix bug with remove duplicates making things break in the channel schedule editor until other tool is used. 2020-11-22 21:11:08 -04:00
vexorian
c06f1b0aad
Merge pull request #202 from vexorian/20201122_dev
20201122 dev
2020-11-22 20:28:42 -04:00
vexorian
fc79a1d79f Make time slots use the 'better' random too. Ensure that time slots are cyclic and the end of the schedule ends at the same time of day as the beginning of the schedule 2020-11-22 20:24:58 -04:00
vexorian
6329641d4c Merge branch 'dev/1.1.x' into dev/1.2.x 2020-11-22 19:25:52 -04:00
vexorian
4e842c71ee
Merge pull request #201 from vexorian/20201122_dev
20201122 dev
2020-11-22 19:21:27 -04:00
vexorian
110bd19a61 Improve random number generation for picking the next filler to play. 2020-11-22 19:18:11 -04:00
vexorian
1254928cd6 Fix bug with the direct path bug fix 2020-11-22 19:18:11 -04:00
vexorian
e7030764b0
Merge pull request #200 from vexorian/20201122_dev
Implement graceful shutdown procedure.
2020-11-22 17:02:24 -04:00
vexorian
852d09fc55 Implement graceful shutdown procedure. So far the only aspect that seems to need is is the xmltv writer, we want to make sure the xmltv is completely written before closing the app. #176 2020-11-22 16:58:59 -04:00
vexorian
63e1a74151
Merge pull request #199 from vexorian/20201122_dev
20201122 dev
2020-11-22 11:13:48 -04:00