Commit graph

3845 commits

Author SHA1 Message Date
Thulinma
0c6cd9bfc6 Added crappy "HiIpcam" IP cam support 2018-01-16 11:18:59 +01:00
Thulinma
adf2d8f4f9 Merge branch 'development' into LTS_development 2018-01-16 11:18:43 +01:00
Thulinma
5cc93a8305 Make base64-encoder more compatible. 2018-01-16 11:18:37 +01:00
Thulinma
3484e41270 Merge branch 'development' into LTS_development 2018-01-15 13:38:30 +01:00
Thulinma
b453788186 Shut down buffers if they were started using INTERNAL_ONLY notation and the parent shuts down. 2018-01-15 13:38:13 +01:00
Thulinma
4cf90aa8d9 Fixed RTSP input VLC compatibility 2018-01-04 12:36:30 +01:00
Thulinma
f30dc37c7f Merge branch 'development' into LTS_development 2018-01-03 11:09:01 +01:00
Thulinma
dd8953faec Allow '=' character in URL encoded paths and fragments 2018-01-03 11:08:55 +01:00
Thulinma
1d70ab288a Merge branch 'development' into LTS_development 2018-01-02 13:24:37 +01:00
Thulinma
dca157228e Fixed RTMP implementation to match 2012 spec update and not 2009 original spec 2018-01-02 13:24:31 +01:00
Thulinma
a1ea79af0c Fixed behaviour when stream cannot be loaded for JSON/JS and HTML page outputs
# Conflicts:
#	src/output/output_http_internal.cpp
2018-01-02 12:07:26 +01:00
Thulinma
6594f9bc94 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-01-02 12:06:35 +01:00
Thulinma
ec2dda0bff Fixed behaviour when stream cannot be loaded for JSON/JS and HTML page outputs, backported a few Pro improvements to OS edition 2018-01-02 12:05:01 +01:00
Thulinma
57b63051cf Merge branch 'development' into LTS_development 2017-12-13 16:37:43 +01:00
Thulinma
bd1b1be37e Downloader class now properly URLencodes paths 2017-12-13 16:37:34 +01:00
Thulinma
7540bfa27f Changed several onFinish'es into onFail, where appropriate 2017-12-13 11:06:50 +01:00
Thulinma
7dd7cc6fe1 Merge branch 'development' into LTS_development 2017-12-13 11:00:08 +01:00
Thulinma
fb88d214fb Changed "No tracks found" input class message to INFO level from WARN level 2017-12-13 10:59:52 +01:00
Thulinma
9f9c67b07e Fixed deadlock on sharedClient during shutdown 2017-12-13 10:53:39 +01:00
Thulinma
f4f644ee34 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hls.cpp
2017-12-11 13:14:44 +01:00
Thulinma
b3cdf34fbc Respond more correctly to failed HLS requests 2017-12-11 13:13:38 +01:00
Thulinma
c9bb214ab9 Merge branch 'development' into LTS_development 2017-12-11 11:49:31 +01:00
Thulinma
c69adc26b9 Fixed shared memory master-mode re-opens causing SIGBUS errors in other parts 2017-12-10 18:21:43 +01:00
Thulinma
90ce2e0b4c No longer disconnect on deleteStream 2017-12-10 01:25:00 +01:00
Thulinma
ca19feed7f Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_storage.cpp
2017-12-08 19:54:44 +01:00
Thulinma
a80146dd25 Updated bash API with unicode support and better usability 2017-12-08 19:48:49 +01:00
Thulinma
26d039f278 Controller now disables colors when stdout is no terminal, additionally disables interactive setup when stdin is no terminal. 2017-12-08 19:48:49 +01:00
Thulinma
304426c2c6 Improved logging system 2017-12-08 19:48:49 +01:00
Thulinma
b023d6031c Updated bash API with unicode support and better usability 2017-12-06 16:59:27 +01:00
Thulinma
8c3178339b Controller now disables colors when stdout is no terminal, additionally disables interactive setup when stdin is no terminal. 2017-12-06 16:59:27 +01:00
Thulinma
626e688bf2 Removed newline from access log message 2017-12-06 16:59:27 +01:00
Thulinma
08dac5b2db Improved logging system 2017-12-06 16:59:27 +01:00
Thulinma
71477f05d3 Fixed HLS non-subtitle output 2017-11-30 14:10:58 +01:00
Thulinma
42df4d136e Merge branch 'development' into LTS_development 2017-11-29 16:31:05 +01:00
Thulinma
8ad71cf6ec What... the hell? Why does this...? Oh well. MAC BUILDS FIXED 2017-11-29 16:31:00 +01:00
Thulinma
0c25d84436 Merge branch 'development' into LTS_development 2017-11-29 15:04:14 +01:00
Thulinma
f4e3087f1a Fixed tryWait semaphore call 2017-11-29 15:04:07 +01:00
Thulinma
3f50ba6651 Fixed tryWait semaphore call 2017-11-29 15:03:41 +01:00
Thulinma
0d9fe0dbfe Merge branch 'development' into LTS_development 2017-11-29 14:51:44 +01:00
Thulinma
db511a6e32 Fixed Windows-based live streams 2017-11-29 14:51:36 +01:00
Thulinma
f32ab1d26d Fixed Windows-based live streams 2017-11-29 14:51:17 +01:00
Thulinma
a07c8ef02e Fixed srt input building with old compilers 2017-11-29 11:24:03 +01:00
Thulinma
185fd6ebb8 TS input now follows generic code path, AlwaysOn made slightly more persistent 2017-11-28 15:17:08 +01:00
Thulinma
a7a8003f2c Merge branch 'development' into LTS_development 2017-11-28 14:48:08 +01:00
Thulinma
3f3fd585c1 Fixed protocol://:port notation for hostless ports over a protocol 2017-11-28 14:47:37 +01:00
Thulinma
3a8698048b Fixed protocol://:port notation for hostless ports over a protocol 2017-11-28 14:47:14 +01:00
Thulinma
e0af7a759e Changed always-on check to getStreamStatus as opposed to streamAlive 2017-11-28 12:46:17 +01:00
Thulinma
685d11fa0c Merge branch 'development' into LTS_development 2017-11-28 12:33:48 +01:00
Cat
e6f64fafb1 LSP: added/tweaked several help messages; tweaked mist.convertBuildOptions() for select inputs, moved general push settings to general autopush settings 2017-11-28 12:31:42 +01:00
Thulinma
8e74d4cd4b Fixed typoes Balder spotted. Wut? But how?! 2017-11-28 11:26:19 +01:00