hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5093 commits 3 branches 0 tags 29 MiB
Commit graph

441 commits

Author SHA1 Message Date
Thulinma
99b5b8361d Merge branch 'development' into LTS_development 2016-02-29 13:20:52 +01:00
Thulinma
77a6315dfb Wipe sessions when they expire. 2016-02-29 13:16:58 +01:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
463e549b4d Fixed naming bug when adding new streams 2016-02-16 09:18:02 +01:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
Thulinma
bf180a2a35 Added "minimal" API request for requesting minimal responses only. 2015-11-27 10:44:21 +01:00
Thulinma
22467d603e Added support for clients and lastms requests in active_streams API call 2015-11-27 10:44:21 +01: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
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
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
Thulinma
16d38459b6 Made JSON library non-recursive. 
Co-authored with Diederick.
 2015-10-06 13:21:14 +02:00
Thulinma
c9a30c2816 Improved on/off display for streams. 2015-09-29 11:03:26 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
10f0f6bb92 addstream/deletestream requests now no longer send a complete stream list as reply, but instead an incomplete stream list. 2015-09-08 22:42:54 +02:00
Thulinma
c8d1c2006e Pro version equivalent of recent free version changes. 2015-09-03 19:56:27 +02:00
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Thulinma
d6922c92f5 Merge branch 'development' into LTS_development 2015-08-28 21:58:43 +02:00
Thulinma
71dc32d2d3 Added ability to break through semaphore locks to the controller monitoring thread. 2015-08-28 21:56:27 +02:00
Thulinma
32cdf623b4 Changes to controller functioning. 2015-08-28 21:45:25 +02:00
Thulinma
cd74fd1e46 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller.cpp
 2015-06-18 16:07:30 +02:00
Thulinma
eaabf9e800 Fixed errors when requesting short URLs, fixed race condition during shutdown of controller. 2015-06-18 16:06:35 +02:00
Thulinma
a3354aeee6 Removed metadata parsing from controller for better stability and faster stream handling. 
# Conflicts:
#	src/controller/controller_streams.cpp
 2015-06-16 13:18:16 +02:00
Thulinma
036178f780 Removed metadata parsing from controller for better stability and faster stream handling. 2015-06-16 11:18:00 +02:00
Thulinma
c04572f685 Removed logs from controller config file. 2015-06-16 11:17:39 +02:00
Thulinma
e0c9173f9a Merge branch 'development' into LTS_development 2015-05-12 11:23:08 +02:00
Thulinma
a3bf393bea Added generic CORS header adder, now used in controller, HLS output and internal HTTP handler. 2015-05-12 11:23:00 +02:00
Thulinma
721e9dfd05 Merge branch 'development' into LTS_development 2015-04-16 13:19:01 +02:00
Thulinma
d120523bbb Improvements to connector shutdown code, attempted fix for Windows support. 2015-04-16 13:18:52 +02:00
Thulinma
5b86b0254b Merge branch 'development' into LTS_development 2015-04-16 12:40:58 +02:00
Thulinma
2e052fa2a1 Removed old converter include. 2015-04-16 12:40:31 +02:00
Thulinma
cb298c57fd Merge branch 'development' into LTS_development 
# Conflicts:
#	CMakeLists.txt
#	src/analysers/info.cpp
 2015-04-16 12:24:37 +02:00
Thulinma
243a05c8af Removed unused code from procs library, updated and simplified connector handler in controller. 2015-04-16 12:23:03 +02:00
Thulinma
184f7ad6c8 Removed old MistInfo binary and dependencies on it. 2015-04-16 12:21:33 +02:00
Thulinma
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Erik Zandvliet
f350ab84fd Fixed the lsp generation, Fixed metadata loading 2015-04-03 14:01:40 +02:00
Thulinma
a9a7ff7202 Tweaked debug message verbosity. 2015-04-02 16:32:08 +02:00
Erik Zandvliet
d370ef4eac Working multi-input 2015-04-02 09:56:47 +02:00
Thulinma
68c5e4a667 Added ui_settings API call for storing integrated settings page configuration. 2015-02-06 01:08:03 +01:00
Thulinma
43d35cf29b Converted previously hardcoded default sizes for shared memory pages to defines. 2015-01-27 12:03:52 +01:00
Thulinma
a001feafca Fixed various live issues. 2014-12-30 02:08:14 +01:00
Thulinma
a47504b5cb Ogg support fixed and re-added. Squash of various commits made by Wouter Spruit. 2014-12-23 13:10:28 +01:00
Thulinma
142ef73f6c Various fixes for live streams. 2014-12-21 13:50:08 +01:00
Thulinma
da612d03b6 Simplified controller config parsing - behaviour unchanged. 2014-12-15 18:14:00 +01:00
Thulinma
55046206fe Fixed various statistics bugs. 2014-12-05 21:31:45 +01:00