brindosch 
							
						 
					 
					
						
						
							
						
						1f18073f00 
					 
					
						
						
							
							Merge pull request  #534  from AEtHeLsYn/master  
						
						... 
						
						
						
						Color correction
Former-commit-id: 7be726f1adb8698684a2b4726650082ed517901f 
						
						
					 
					
						2016-03-22 00:56:41 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						7da3e83597 
					 
					
						
						
							
							Update JsonConnection.cpp  
						
						... 
						
						
						
						Former-commit-id: c701972ecddcd9655f0aa56b69301ad463f8dcb0 
						
						
					 
					
						2016-03-21 17:39:02 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						fa3b338894 
					 
					
						
						
							
							Update hyperion-remote.cpp  
						
						... 
						
						
						
						Former-commit-id: 2ef2b5d21eda53e2286af8edf7200eb73f5ae3bf 
						
						
					 
					
						2016-03-21 17:20:06 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						9987590e5e 
					 
					
						
						
							
							Update hyperion-remote.cpp  
						
						... 
						
						
						
						Former-commit-id: 652cde0ee1ef0fed1492c63bf78787467f9dd2b6 
						
						
					 
					
						2016-03-21 17:19:06 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						909112fbfb 
					 
					
						
						
							
							Update JsonConnection.cpp  
						
						... 
						
						
						
						Former-commit-id: 712db0e3d8e525353d62bd7dfc6e2dd708b09b85 
						
						
					 
					
						2016-03-21 17:13:46 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						4836bfc863 
					 
					
						
						
							
							Update JsonConnection.h  
						
						... 
						
						
						
						Former-commit-id: 4a0983b135f8386ee4e0db81c044dbaa87e05c03 
						
						
					 
					
						2016-03-21 17:10:01 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						a15a680dc3 
					 
					
						
						
							
							Update CustomParameter.h  
						
						... 
						
						
						
						Former-commit-id: 99fa0c1a3d6321dc41f4fb1623aee5b364220a67 
						
						
					 
					
						2016-03-21 17:09:10 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						0bafc4a3cc 
					 
					
						
						
							
							Create ColorCorrectionValues.h  
						
						... 
						
						
						
						Former-commit-id: d765e8c7562d6eac5e03e939bd88c858c50597bb 
						
						
					 
					
						2016-03-21 17:08:10 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						1f1aee0c37 
					 
					
						
						
							
							Final fixex  
						
						... 
						
						
						
						Former-commit-id: 7b2e1a33ab7705dddadfa1ec99d3d7c379ab10dd 
						
						
					 
					
						2016-03-13 21:14:22 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						28f67871dc 
					 
					
						
						
							
							More fixes  
						
						... 
						
						
						
						Former-commit-id: 331ba604dba8aa16f9cf42c5827c8542502be545 
						
						
					 
					
						2016-03-13 13:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						a5a17776d4 
					 
					
						
						
							
							BugFix  
						
						... 
						
						
						
						Former-commit-id: 8887ee93d5bcaa7ee13f4f5afb601a65d59ee113 
						
						
					 
					
						2016-03-13 12:10:54 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						e4d77660a4 
					 
					
						
						
							
							Bug fixes  
						
						... 
						
						
						
						Former-commit-id: a6783a75edb83988d1737df3d4a7a14c71ec4223 
						
						
					 
					
						2016-03-13 11:59:36 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						84c48b9a0a 
					 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/tvdzwan/master' into test  
						
						... 
						
						
						
						Former-commit-id: 19831aa23078659d7f285b0e91bffff21a932283 
						
						
					 
					
						2016-03-13 11:52:38 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						fd2cb44b1c 
					 
					
						
						
							
							merge upstream  
						
						... 
						
						
						
						Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47 
						
						
					 
					
						2016-03-13 08:07:58 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						c7df8c23c6 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id  
						
						... 
						
						
						
						Conflicts:
	src/hyperion-aml/CMakeLists.txt
	src/hyperion-remote/CMakeLists.txt
	src/hyperion-v4l2/CMakeLists.txt
Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb 
						
						
					 
					
						2016-03-13 08:04:49 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						3dae8d069c 
					 
					
						
						
							
							fix bootsequence.  
						
						... 
						
						
						
						if boot duration not 0 then boot prio is set to 0 to avoid start of grabber overrules boot efx
cleanup bootseq code
Former-commit-id: 85c9f099bd9a2e8d695117a24164d8ce81ad2a36 
						
						
					 
					
						2016-03-12 19:21:47 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						a5e042225e 
					 
					
						
						
							
							Update JsonConnection.cpp  
						
						... 
						
						
						
						Former-commit-id: 7b748e605939b65f02cb768a924faa48787618c3 
						
						
					 
					
						2016-03-11 12:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						8fce604ccb 
					 
					
						
						
							
							Update JsonConnection.h  
						
						... 
						
						
						
						Former-commit-id: 5d44428cd95e2b81b867ace67eb1f77aceb47856 
						
						
					 
					
						2016-03-11 12:29:07 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						39b318e842 
					 
					
						
						
							
							Update JsonConnection.h  
						
						... 
						
						
						
						Former-commit-id: 5191309bb65f446d8d60e21193ece00560d5e67b 
						
						
					 
					
						2016-03-11 12:28:45 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						8caf69e541 
					 
					
						
						
							
							Update JsonConnection.h  
						
						... 
						
						
						
						Former-commit-id: fa07c01ab5bb34029d8b13ea93187a54686d784c 
						
						
					 
					
						2016-03-11 12:21:04 +01:00 
						 
				 
			
				
					
						
							
							
								AEtHeLsYn 
							
						 
					 
					
						
						
							
						
						0baebe3873 
					 
					
						
						
							
							Update hyperion-remote.cpp  
						
						... 
						
						
						
						Former-commit-id: bb2282e48bdd93d4dffcd763ff34e33d3f00670c 
						
						
					 
					
						2016-03-11 12:20:59 +01:00 
						 
				 
			
				
					
						
							
							
								Serhan 
							
						 
					 
					
						
						
							
						
						a25d8328f4 
					 
					
						
						
							
							Update OsxWrapper.cpp  
						
						... 
						
						
						
						typooooo :D
Former-commit-id: 61df249f76c500845a460888b5f64dd70c056d28 
						
						
					 
					
						2016-03-10 21:34:02 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						e01bcd708d 
					 
					
						
						
							
							add install commands  
						
						... 
						
						
						
						instead of "make" use "make install/strip" release compile
Former-commit-id: f4dd2d9e1a4d815b667665892a3bd9cec64218a3 
						
						
					 
					
						2016-03-10 12:22:44 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						153d1f0999 
					 
					
						
						
							
							print version for every standalone grabber and hyperiond  
						
						... 
						
						
						
						Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407 
						
						
					 
					
						2016-03-10 12:01:10 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						49e867f5fc 
					 
					
						
						
							
							add an auto generated version id  
						
						... 
						
						
						
						Former-commit-id: df3ad6b08e24e73d957611e8be45e7e8cc717b8c 
						
						
					 
					
						2016-03-10 06:53:21 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						014a4288f9 
					 
					
						
						
							
							implement osx grabber .... not tested! need testers!  
						
						... 
						
						
						
						tune usage hints in external grabbers
Former-commit-id: 816821dd773e90b8076e9b50ced9eb052f43c2f4 
						
						
					 
					
						2016-03-09 11:03:20 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						e6170ed698 
					 
					
						
						
							
							create external framebuffer grabber  
						
						... 
						
						
						
						cleanup some cmakelist files
fix qt5 build
Former-commit-id: 024b5b6dc5dc96fcb16f6e8958ad3684a6728504 
						
						
					 
					
						2016-03-09 07:03:17 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						0bc725054c 
					 
					
						
						
							
							make all prios settable and make prios more consistent  
						
						... 
						
						
						
						Former-commit-id: f1d1c35063e98389d627f3535d2a94da33a22da4 
						
						
					 
					
						2016-03-08 17:31:56 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						2c831c1110 
					 
					
						
						
							
							add standalone amlogic grabber  
						
						... 
						
						
						
						fix standalone dispmanx grabber
Former-commit-id: 5ace9bc90a6fe76f5a51ecef95d6e7119d1102db 
						
						
					 
					
						2016-02-24 16:03:21 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						8fdf97e693 
					 
					
						
						
							
							prepare standalone amlogic grabber  
						
						... 
						
						
						
						activate internal amlogic grabber forwarding
Former-commit-id: 21dabf759935836eef556baeb8a27e362e95ae96 
						
						
					 
					
						2016-02-24 14:42:25 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						6bef43887b 
					 
					
						
						
							
							implement dispmanx forwarding a a separate dispmanx wrapper  
						
						... 
						
						
						
						implement forwarding for amlogic grabber
Former-commit-id: 8a793d24bd083f9eca07c34ec3b222f0e54b4426 
						
						
					 
					
						2016-02-24 14:34:19 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						a9e8f0264a 
					 
					
						
						
							
							implement proto forwarding for osxgrabber and framebuffer. prepare forwarding in amlogic and dispmanx  
						
						... 
						
						
						
						Former-commit-id: d67fc2b7fe8877e6eadf31a8c76e4a68110c6680 
						
						
					 
					
						2016-02-17 00:44:06 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						629461b944 
					 
					
						
						
							
							implement proto forwarding for hyperiond internal v4l2 grabber  
						
						... 
						
						
						
						cleanup
Former-commit-id: 669f139386633e3435cdc33639134819464afd4d 
						
						
					 
					
						2016-02-16 15:41:40 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						b01b5eb005 
					 
					
						
						
							
							- prepare general way to send (proto) messages. currently only incomming protomessages are forwarded  
						
						... 
						
						
						
						- begin impl. of json server
Former-commit-id: 8f9237cd57ada1e84dc05e60b9ad723e47fd57b1 
						
						
					 
					
						2016-02-15 18:25:18 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						5dc59344c4 
					 
					
						
						
							
							forward protobuf messages.  
						
						... 
						
						
						
						configure (send proto messages to two other hyperiond):
"protoServer" :
{
	"port"    : 19446,
	"forward" : [ "192.168.0.10:19445", "192.168.0.11:19445" ]
},
Former-commit-id: 33af219cfce99609ca7245d662dc0f0561013bbd 
						
						
					 
					
						2016-02-08 16:56:23 +01:00 
						 
				 
			
				
					
						
							
							
								tvdzwan 
							
						 
					 
					
						
						
							
						
						870b74b011 
					 
					
						
						
							
							Merge pull request  #475  from redPanther/bootsequence  
						
						... 
						
						
						
						make priority of boot effect adjustable.
Former-commit-id: a722d2aaaa9248d85002137fc91016c8cc0a29bf 
						
						
					 
					
						2016-02-08 14:53:30 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						4decb05348 
					 
					
						
						
							
							adds ability to set static color on boot.  
						
						... 
						
						
						
						Former-commit-id: 41ca5ba73fde698d73380fac3dcee5e33b310d76 
						
						
					 
					
						2016-01-31 22:38:30 +01:00 
						 
				 
			
				
					
						
							
							
								redpanther 
							
						 
					 
					
						
						
							
						
						8a906b9d01 
					 
					
						
						
							
							make priority of boot effect adjustable. It is set to 0 to not alter to current behaciour.  
						
						... 
						
						
						
						A value of 900 could be more feasable, because boot effect with prio 0 isn't overwritable by other effects
Former-commit-id: 1852339e6ade62c86719cfbb47faa46eb8f8d4ed 
						
						
					 
					
						2016-01-31 04:34:13 +01:00 
						 
				 
			
				
					
						
							
							
								Paulchen-Panther 
							
						 
					 
					
						
						
							
						
						bfa4185b9a 
					 
					
						
						
							
							Update hyperion-x11.cpp  
						
						... 
						
						
						
						Former-commit-id: 6fa337290c285d32a2fcc1b180c80d2849334bb8 
						
						
					 
					
						2016-01-21 16:42:30 +01:00 
						 
				 
			
				
					
						
							
							
								Paulchen-Panther 
							
						 
					 
					
						
						
							
						
						3e078b2e15 
					 
					
						
						
							
							Update X11Wrapper.h  
						
						... 
						
						
						
						Former-commit-id: 231123e1dee2dacf6d5225a3833f51544ca6f99c 
						
						
					 
					
						2016-01-21 16:42:02 +01:00 
						 
				 
			
				
					
						
							
							
								Paulchen-Panther 
							
						 
					 
					
						
						
							
						
						66609a03a0 
					 
					
						
						
							
							Update X11Wrapper.cpp  
						
						... 
						
						
						
						Former-commit-id: f644a24c77db18feb34526aa937f12700865f5be 
						
						
					 
					
						2016-01-21 16:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								frostworx 
							
						 
					 
					
						
						
							
						
						defe217c89 
					 
					
						
						
							
							added optional QT5 support - LedDevicePhilipsHue needs proper fixes  
						
						... 
						
						
						
						Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085 
						
						
					 
					
						2016-01-06 17:31:23 +01:00 
						 
				 
			
				
					
						
							
							
								T.van der Zwan 
							
						 
					 
					
						
						
							
						
						ad876b0d8c 
					 
					
						
						
							
							Fixed json value lookup  
						
						... 
						
						
						
						Only close the amlogic device every 20th succesfull reads.
Former-commit-id: 46c0cf1465b8c8b33d696bb2aeac5cabb1cb2819 
						
						
					 
					
						2015-09-03 21:37:49 +02:00 
						 
				 
			
				
					
						
							
							
								T.van der Zwan 
							
						 
					 
					
						
						
							
						
						a3db06e90e 
					 
					
						
						
							
							Demangled config naming convention is framegrabber.  
						
						... 
						
						
						
						Former-commit-id: ccb9b98f3e42785620ade9970b33d94c77b93508 
						
						
					 
					
						2015-08-20 10:14:19 +02:00 
						 
				 
			
				
					
						
							
							
								T.van der Zwan 
							
						 
					 
					
						
						
							
						
						5497fbf577 
					 
					
						
						
							
							Finished the amlogic grabber for the 'WeTek Play'  
						
						... 
						
						
						
						Former-commit-id: e459cdfe6273ad2bfee92d2d190801ebdc691a5c 
						
						
					 
					
						2015-08-20 09:51:44 +02:00 
						 
				 
			
				
					
						
							
							
								T.van der Zwan 
							
						 
					 
					
						
						
							
						
						1447209846 
					 
					
						
						
							
							Added tool to create screenshot for amlogic grabber  
						
						... 
						
						
						
						Former-commit-id: d403deab3f931d01bec97b726d8e70b73d3a0012 
						
						
					 
					
						2015-08-08 08:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								Gamadril 
							
						 
					 
					
						
						
							
						
						3fd20ec5fa 
					 
					
						
						
							
							- refactored framebuffer grabber to use ImageResampler  
						
						... 
						
						
						
						- added OsxGrabber for OSX
- added binary for imx6 (cubox-i) and updated install script
Former-commit-id: 2c55e292c842c67e54ce36bd91e4f6303b98687a 
						
						
					 
					
						2015-01-24 23:42:22 +01:00 
						 
				 
			
				
					
						
							
							
								Gamadril 
							
						 
					 
					
						
						
							
						
						c89e1fcefa 
					 
					
						
						
							
							Added frame buffer grabber support  
						
						... 
						
						
						
						Former-commit-id: a73767a1abb2cac977492bd8c6cc593fb21840e1 
						
						
					 
					
						2015-01-18 00:04:45 +01:00 
						 
				 
			
				
					
						
							
							
								poljvd 
							
						 
					 
					
						
						
							
						
						a041941e7a 
					 
					
						
						
							
							Fix build with embedded protobuf library  
						
						... 
						
						
						
						Former-commit-id: 5c60566f2d4a9c65fc0fe677841a34d7ef73549a 
						
						
					 
					
						2014-12-20 20:15:04 +01:00 
						 
				 
			
				
					
						
							
							
								poljvd 
							
						 
					 
					
						
						
							
						
						12da40dc58 
					 
					
						
						
							
							Fix typo  
						
						... 
						
						
						
						Former-commit-id: 134df5769b2bd608d08357c132d2a5cb1763dc4f 
						
						
					 
					
						2014-12-17 16:18:23 +01:00