| 
								
								
									 Thulinma | bf382cbea0 | Updated updater. Yes, the irony is not lost on me. | 2017-05-11 14:03:01 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 0eca65e433 | Merge branch 'development' into LTS_development | 2017-05-09 16:23:23 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 101a8d521c | Fixed debug level being null when unset | 2017-05-09 15:48:05 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 4f1e653c44 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller_streams.cpp | 2017-05-09 13:27:07 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 0e0da824f7 | Robustified stream/protocol related API calls | 2017-05-09 11:31:24 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 85202a0b30 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h | 2017-05-08 16:10:48 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 04e0dfeab0 | Added instance ID | 2017-05-08 15:56:58 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 4bdcb24132 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_storage.cpp | 2017-05-08 10:23:54 +02:00 |  | 
				
					
						| 
								
								
									 Cat | 8c3fb6b88d | LSP: use the updates to the API; allow ?foo=bar after the match in input matching; updated CSS to match "recent" website updates | 2017-05-08 10:20:41 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 16637b3138 | Backported many Pro API calls to OS edition, improved storage method of config file | 2017-05-08 10:20:41 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 502ed31ef7 | Improvements to JSON library | 2017-05-08 09:53:43 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 3628842ace | Merge branch 'development' into LTS_development # Conflicts:
#	CMakeLists.txt
#	src/analysers/analyser.cpp
#	src/analysers/analyser.h
#	src/analysers/analyser_rtmp.cpp | 2017-05-02 11:46:41 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 506be4a64b | Analysers rewrite, mostly by Ramkoemar, partially by myself | 2017-05-02 11:45:53 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | dda3a24805 | Working .wav live and VoD output, PCM A-law and MP3 | 2017-05-02 10:26:35 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b7d1d38fb4 | Added RIFF analyser | 2017-05-02 10:26:35 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 945e6f2d1a | Analyser unification finished | 2017-05-02 10:26:35 +02:00 |  | 
				
					
						| 
								
								
									 Ramoe | 051a8c826b | Analysers unification | 2017-05-01 13:58:14 +02:00 |  | 
				
					
						| 
								
								
									 Ramoe | 19198e3abd | Fixes to OGG library Read function | 2017-05-01 13:58:14 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 482da790ea | Validators for load tests, and load test scripts. | 2017-05-01 13:58:14 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 2cec1f7836 | Fixed session cache race conditions | 2017-05-01 11:54:02 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 40b7cb7e63 | Merge branch 'development' into LTS_development | 2017-05-01 11:53:56 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b4dc59d409 | Define ACCESSPERMS in shared_memory.h if not defined | 2017-05-01 11:53:38 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 79b7ef3300 | Lowered debug level of socket address comparisons | 2017-05-01 11:53:31 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | efc80123f0 | Access log compile fixes | 2017-04-18 19:33:40 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 66ecd88130 | Fixed FLV/RTMP/HDS A-law and Mu-law support | 2017-04-18 12:38:41 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | d158ba3213 | Added PCM A-law support to RTSP, both input and output | 2017-04-18 12:38:40 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b9f60ac92c | Sessions are now wiped after the disconnect timeout, if denied access | 2017-04-18 12:34:00 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9ddfa97148 | Added automatic User-Agent stream tagging | 2017-04-18 12:33:54 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | d0912c9d00 | Controller now listens locally to UDP port 4242 for API commands, added always-minimal api2 request type. | 2017-04-18 12:33:49 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 3980b8c8c1 | Access logs + made prometheus runtime changeable | 2017-04-18 12:33:06 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7629b00a4c | Merge branch 'development' into LTS_development | 2017-04-18 12:32:39 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | a7718c78e9 | Made JSON::string_escape a public function | 2017-04-18 12:20:25 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | a82be2775f | Added local-only auto-authorize for API | 2017-04-18 12:20:20 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 5e2b29466b | Fixes and improvements to generic push-input handling | 2017-04-18 12:00:58 +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 | aa0e09e45b | Fixed timings for license system | 2017-03-30 12:22:16 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | ea4b0f8f45 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h | 2017-03-29 12:06:35 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 11f95a64fe | Improved console interface | 2017-03-29 12:05:42 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 831e454ebb | Improved console interface | 2017-03-29 12:03:15 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | d352c74ad0 | Fixed 32-bit compile error | 2017-03-20 18:25:40 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 1c081cc6a9 | Merge branch 'development' into LTS_development | 2017-03-20 16:59:34 +01:00 |  | 
				
					
						| 
								
								
									 Cat | 2454e03bcf | LSP: fail gracefully when a pointer is undefined | 2017-03-20 15:56:22 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7617158ece | Merge branch 'development' into LTS_development | 2017-03-17 14:18:50 +01:00 |  | 
				
					
						| 
								
								
									 Cat | 357182d244 | LSP: handle an empty streaminfo object | 2017-03-17 14:12:28 +01:00 |  | 
				
					
						| 
								
								
									 Cat | 64219a62f1 | added autoreload for offline streams | 2017-03-17 14:12:28 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 042f998bd9 | Merge branch 'development' into LTS_development | 2017-03-17 14:10:58 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 67feb20741 | Fixed forking bug | 2017-03-17 14:07:55 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | c7034fee86 | Merge branch 'development' into LTS_development # Conflicts:
#	src/io.cpp
#	src/io.h
#	src/output/output.cpp
#	src/output/output.h
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h | 2017-03-16 17:20:12 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 746d982d28 | bufferLivePacket improvements for generic Outputs | 2017-03-16 17:15:50 +01:00 |  |