Commit graph

84 commits

Author SHA1 Message Date
Thulinma
98e3940079 Robustify accesses to server config 2018-11-28 11:46:33 +01:00
Thulinma
109995809d Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-11-13 16:35:12 +01:00
Thulinma
251dc5f171 Better onFail handling, better HTTP failure handling 2018-11-13 16:34:30 +01:00
Thulinma
855f431b59 Stream source no longer listed in internal HTTP outputs 2018-07-29 21:34:28 +02:00
Thulinma
4c34c5fbe5 Stream source no longer listed in internal HTTP outputs 2018-07-29 21:34:16 +02:00
Thulinma
0f0615236f Merge branch 'development' into LTS_development 2018-07-23 12:53:28 +02:00
Thulinma
d944d4600e Added CORS headers and OPTIONS/HEAD support for HTTP internal's onFail responses. 2018-07-23 12:53:23 +02:00
Thulinma
a084005644 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2018-05-16 11:10:55 +02:00
Thulinma
ecbb48dbfe Fixed http_internal responses for offline streams 2018-05-16 10:47:14 +02:00
Thulinma
d46eaf22e5 Added support for HTTP parameters in HTTPS protocol 2018-04-04 16:32:25 +02:00
Thulinma
da5e15621e Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-04-04 16:31:36 +02:00
Thulinma
e39599894f support for protocol detection in player.js internal default URL 2018-04-04 16:05:27 +02:00
Thulinma
266ab3a654 Implemented browser detection and handling of output-specific browser exceptions. 2018-03-27 15:58:51 +02:00
Thulinma
f65c759292 Implemented browser detection and handling of output-specific browser exceptions. 2018-03-27 15:57:08 +02:00
Thulinma
1b15fbff2b Added HTTP info.js websocket mode
# Conflicts:
#	src/output/output_http_internal.cpp
2018-03-20 15:16:24 +01:00
Thulinma
e06b14ce77 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp
2018-03-20 15:11:19 +01:00
Thulinma
b0bf1d14ec Added HTTP info.js websocket mode 2018-03-20 15:06:37 +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
1b9164910c Merge branch 'development' into LTS_development 2017-10-24 14:44:00 +02:00
Thulinma
7550ce52e4 Added missing relative URL for HTML page stream output 2017-10-24 14:43:55 +02:00
Thulinma
bef46f969c Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
c0dd64bc7b Merge branch 'development' into LTS_development 2017-05-11 14:14:44 +02:00
Cat
8143d6af05 Embed: dynamically load player js only if required 2017-05-11 14:14:31 +02:00
Thulinma
29cc6c15f8 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2017-04-06 10:29:48 +02:00
Cat
7b1652498b when public address is configured in the http protocol, thats where player.js should be loaded from 2017-04-06 10:08:52 +02:00
Thulinma
746d982d28 bufferLivePacket improvements for generic Outputs 2017-03-16 17:15:50 +01:00
Thulinma
eef9303e61 bufferLivePacket improvements for generic Outputs 2017-03-16 17:12:54 +01:00
Thulinma
5000afe768 Added --public-address option to HTTP output, for address overwriting 2017-03-10 11:39:31 +01:00
Thulinma
25ddaa3595 Merge branch 'development' into LTS_development 2017-03-06 11:53:52 +01:00
Cat
aa3527dcb0 Embed: custom streaminfo 2017-03-06 11:51:32 +01:00
Cat
b0326ccd1e LSP: thumbnailing; currently disabled 2017-03-06 11:46:44 +01:00
Thulinma
dadb1ebde8 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
2017-01-10 12:36:53 +01:00
Thulinma
fd5b9805de Fixed favicon.ico 2017-01-10 12:34:43 +01:00
Thulinma
aebeeabd2b Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_httpts.cpp
#	src/output/output_ts_base.h
2016-12-28 16:32:16 +01:00
Cat
1c0fd833bb Embed: VideoJS player added 2016-12-28 16:25:22 +01:00
Thulinma
7c37620294 Merge branch 'development' into LTS_development 2016-11-16 16:33:01 +01:00
Thulinma
bcff43dc80 Changed HTTP internals to use more generic URL building 2016-11-16 16:32:56 +01:00
Thulinma
08813dcd9b Merge branch 'development' into LTS_development 2016-09-22 16:42:04 +02:00
cat
d4be01474d Meta player, new embed code, new LSP style 2016-09-22 16:40:13 +02:00
Thulinma
cf75a2d6a2 Merge branch 'development' into LTS_development 2016-07-25 13:24:47 +02:00
Thulinma
bfa9882e8c Added ISO639-2 decoding in JSON-formatted metadata output 2016-07-25 13:24:36 +02:00
Thulinma
6694fedb3c Merge branch 'development' into LTS_development 2016-07-21 10:15:34 +02:00
Thulinma
33a0b2fae3 Added URL encode for info_/embed_ stream URLs 2016-07-21 10:15:26 +02:00
Thulinma
e0cc16cd86 Merge branch 'development' into LTS_development 2016-07-19 12:05:12 +02:00
Thulinma
d5fee4d656 Even more JSON/VTT/SRT fixes and internal URL handler improvements 2016-07-19 12:05:05 +02:00
Thulinma
ea18815676 Fixed slow embed code (internal HTTP output) problem 2016-06-10 14:22:29 +02:00
Thulinma
54b9079ab1 Fixed slow embed code (internal HTTP output) problem 2016-06-09 15:17:40 +02:00