Thulinma
|
3ed0d1b3a3
|
Merge branch 'development' into LTS_development
|
2015-10-19 16:59:36 +02:00 |
|
cat
|
718d009f9f
|
embed exclude for IE/FF fix
|
2015-10-19 16:47:52 +02:00 |
|
Thulinma
|
a02236eca1
|
Merge branch 'development' into LTS_development
|
2015-10-16 09:21:00 +02:00 |
|
cat
|
2a7a714aad
|
LSP - bad code, bad! no overwriting my streams object with null :(
|
2015-10-16 09:13:11 +02:00 |
|
cat
|
0b784a3d53
|
LSP embed code page small edits
|
2015-10-15 16:31:31 +02:00 |
|
Thulinma
|
596689c9ee
|
Merge branch 'development' into LTS_development
|
2015-10-15 10:28:33 +02:00 |
|
Erik Zandvliet
|
c417630abe
|
Same fix, but for non-const iterator
|
2015-10-15 10:28:24 +02:00 |
|
Thulinma
|
101de0b81c
|
Merge branch 'development' into LTS_development
|
2015-10-14 16:53:20 +02:00 |
|
Thulinma
|
9737d9fbdf
|
Added missing return value for JSON class.
|
2015-10-14 16:53:13 +02:00 |
|
Thulinma
|
de1d202457
|
Made RTSP max send value runtime configurable.
|
2015-10-14 14:30:28 +02:00 |
|
Thulinma
|
39fd36db04
|
Merge branch 'development' into LTS_development
# Conflicts:
# Makefile
|
2015-10-14 12:56:47 +02:00 |
|
Thulinma
|
c2cb32e022
|
Removed old Makefile.
|
2015-10-14 12:56:26 +02:00 |
|
Thulinma
|
e3f324e9af
|
Merge branch 'development' into LTS_development
|
2015-10-14 11:19:08 +02:00 |
|
Thulinma
|
b28b463662
|
Improved HLS bandwidth accuracy.
|
2015-10-14 11:18:56 +02:00 |
|
Thulinma
|
e567945bcc
|
Merge branch 'development' into LTS_development
|
2015-10-14 10:57:17 +02:00 |
|
Thulinma
|
acbeb1f409
|
Added missing trigger.
|
2015-10-14 10:57:10 +02:00 |
|
Thulinma
|
279add438a
|
Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
|
2015-10-14 10:48:00 +02:00 |
|
Thulinma
|
eb6b98b219
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/controller/controller.cpp
|
2015-10-14 10:38:59 +02:00 |
|
Thulinma
|
3ba11441a1
|
Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly.
|
2015-10-14 10:25:58 +02:00 |
|
Thulinma
|
6b21e06c76
|
Merge branch 'development' into LTS_development
|
2015-10-13 15:56:53 +02:00 |
|
cat
|
1cae0a7fd3
|
LSP - trigger deletion with the rest of config
|
2015-10-13 15:56:24 +02:00 |
|
cat
|
9943509d5f
|
LSP back to extend, Jarons solution = issues.
|
2015-10-13 15:56:15 +02:00 |
|
Thulinma
|
73ef41e97b
|
Properly trigger failure state on streams when connection to source fails.
|
2015-10-13 15:55:26 +02:00 |
|
Thulinma
|
330117b1f4
|
Merge branch 'development' into LTS_development
|
2015-10-13 15:34:58 +02:00 |
|
Thulinma
|
2f4a4660d0
|
Fixed controller breaking when all connectors are deleted simultaneously.
|
2015-10-13 15:34:24 +02:00 |
|
Thulinma
|
21ce93f520
|
Haha.
|
2015-10-13 12:47:07 +02:00 |
|
Thulinma
|
516e9c8f55
|
Merge branch 'development' into LTS_development
|
2015-10-13 12:26:31 +02:00 |
|
cat
|
a389234224
|
LSP added server_minified.html to test the minified version
|
2015-10-13 10:04:58 +02:00 |
|
cat
|
b9a9bde94a
|
LSP - grmbl incomplete list
|
2015-10-13 09:53:09 +02:00 |
|
Thulinma
|
47b61cae5a
|
Merge branch 'development' into LTS_development
|
2015-10-09 15:30:32 +02:00 |
|
cat
|
053ada16b0
|
LSP - fixed firefox location.hash url encoding issue
|
2015-10-09 15:28:45 +02:00 |
|
Thulinma
|
b53cc64208
|
Merge branch 'development' into LTS_development
|
2015-10-09 15:01:50 +02:00 |
|
Thulinma
|
1eb5725751
|
Fixes to JSON library.
|
2015-10-09 15:00:03 +02:00 |
|
Thulinma
|
9c8fbb2ac3
|
Merge branch 'development' into LTS_development
|
2015-10-08 14:41:44 +02:00 |
|
cat
|
67dc1848e7
|
embed mp4 no ff/ie
|
2015-10-08 14:41:19 +02:00 |
|
Thulinma
|
c390035523
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/io.cpp
|
2015-10-08 13:58:43 +02:00 |
|
Thulinma
|
c20b8f2081
|
Fixed newlines in debug messages. Also, backported various Pro edition fixes that belonged in OS edition.
|
2015-10-08 13:54:54 +02:00 |
|
cat
|
3c409d4b42
|
LSP - delete triggers
|
2015-10-07 11:28:54 +02:00 |
|
cat
|
182ec4656e
|
LSP: bugfix for empty config files
|
2015-10-07 11:28:54 +02:00 |
|
Thulinma
|
5df392ef6b
|
Merge branch 'development' into LTS_development
|
2015-10-07 11:24:04 +02:00 |
|
Thulinma
|
8fb8a98c5f
|
Pro side of JSON library updates.
|
2015-10-07 11:06:22 +02:00 |
|
Thulinma
|
74c8932106
|
Merge branch 'development' into json_mod_LTS
# Conflicts:
# lib/shared_memory.cpp
# src/controller/controller.cpp
# src/io.cpp
# src/output/output.cpp
# src/output/output_http_internal.cpp
|
2015-10-07 11:05:49 +02:00 |
|
cat
|
80ba997c52
|
LSP triggers: dont show stream options for system or output triggers
|
2015-10-07 10:24:51 +02:00 |
|
Thulinma
|
6d25774b94
|
Improved performance of FLV input and generic input IO class.
|
2015-10-06 16:36:06 +02:00 |
|
Thulinma
|
16d38459b6
|
Made JSON library non-recursive.
Co-authored with Diederick.
|
2015-10-06 13:21:14 +02:00 |
|
Thulinma
|
f464a69371
|
Merge branch 'development' into LTS_development
# Conflicts:
# lsp/main.css
|
2015-10-05 21:43:30 +02:00 |
|
Thulinma
|
7905bb2bda
|
LSP bugfixes by Carina van der Meer
|
2015-10-05 21:39:52 +02:00 |
|
Erik Zandvliet
|
b493976f90
|
MP4 HEVC fix
|
2015-10-05 17:08:18 +02:00 |
|
Erik Zandvliet
|
01472ca88d
|
Fix for TS Input CPU Usage
|
2015-10-05 17:08:10 +02:00 |
|
Thulinma
|
8567e5192a
|
Merge branch 'development' into LTS_development
|
2015-10-02 14:58:06 +02:00 |
|