e667be5e0b
Merge remote-tracking branch 'upstream/master' into proto_json_forwarder
...
Former-commit-id: 6eb800d3ed5badd831bd79fc8cfb66115df8ec28
2016-02-24 15:07:30 +01:00
8fdf97e693
prepare standalone amlogic grabber
...
activate internal amlogic grabber forwarding
Former-commit-id: 21dabf759935836eef556baeb8a27e362e95ae96
2016-02-24 14:42:25 +01:00
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
9e03b4beec
Merge pull request #496 from wisc17/blackborder
...
Blackborder Improved +
Former-commit-id: 7de859369bb5dec4bb3672079bb1169d87d12ad5
2016-02-23 21:03:05 +01:00
257a63acf9
Merge pull request #495 from Danimal4326/master
...
Fix compile issue for missing ceil function
Former-commit-id: 4540e6ce6b7a5fe4b7c86e0489d62da840227ca7
2016-02-23 21:02:57 +01:00
78b1c6fe39
Merge pull request #444 from penfold42/master
...
Add UDP protocol support
Former-commit-id: b2d91d3963e7eeacfc7d57a507cfc70f32ac9a5d
2016-02-23 21:02:39 +01:00
ec67caf24e
add ability to convert an image to RGB color order
...
forwarder: add flag to detect if forwarding is enabled
Former-commit-id: c814651ec4973fe3b2bfca7c0370a0bac752f025
2016-02-19 13:31:08 +01:00
0f17e031e8
basic loop connection detection. prevent if you configure forward to 127.0.0.1:<port> and your server has the same port.
...
But this doesn't protect if not forwarded to localhost "127.0.0.1". Loop connections across different hosts arn't detected too.
Former-commit-id: 464a80708ebd11c0f7c83dc87a1afe0f10e0e078
2016-02-18 10:32:38 +01:00
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
46c5a2ec05
use correct include for std::runtime_error
...
Former-commit-id: a96b727cc0258fda9684f5df52084dd8d96068e3
2016-02-16 15:56:20 +01:00
629461b944
implement proto forwarding for hyperiond internal v4l2 grabber
...
cleanup
Former-commit-id: 669f139386633e3435cdc33639134819464afd4d
2016-02-16 15:41:40 +01:00
738bafee99
forwarder: add missing include
...
Former-commit-id: 58d07b73ff1ad321a9cfbf73895b438665ce3c14
2016-02-16 14:59:31 +01:00
df91527557
implement json forwarder
...
Former-commit-id: 5519118304bd5690e6b512481347579339e78ac9
2016-02-15 20:53:03 +01:00
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
3996ff789c
remove include of cmath lib
...
Former-commit-id: 004c76c724b9739d977a93d3574821db2c4de2e8
2016-02-11 12:55:41 -06:00
63ec2909eb
added bottom right to osd mode
...
Former-commit-id: 3972abaf30d46558d310dbc5e2d164330e9a5b63
2016-02-11 15:50:51 +01:00
0661ad74f6
Fx compile issue for missing ceil function
...
Former-commit-id: f5a6ac2c19b73aa48b5f4292cfa912dc2936701b
2016-02-10 12:22:19 -06:00
773222192d
fixed upd merge conflicts and fadecandy compiler warning
...
Former-commit-id: cb9506a68deff80a331f6455c3cb8fa783a2140e
2016-02-10 00:57:21 +01:00
d6b5dc7ae6
Revert "Update LedDeviceAPA102.cpp by pcaffardi"
...
Former-commit-id: 493b32c03f922cc26d9fb4fce4778636f6a96e84
2016-02-09 20:21:49 +01:00
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
cf34f45daa
Merge pull request #484 from wisc17/apa102
...
Update LedDeviceAPA102.cpp by pcaffardi
Former-commit-id: 0e586eda7636b4abb378fe8adf1b35145e63eb1f
2016-02-08 14:55:08 +01:00
f3cd0451c9
Merge pull request #483 from wisc17/blackborder
...
Blackborder Improved + (bugfix and enhancement)
Former-commit-id: 2d82dca6fafbe6eb019027c37abf679fd7066980
2016-02-08 14:54:48 +01:00
3280f7198d
Merge pull request #469 from redPanther/fadecandy
...
fadecandy fix
Former-commit-id: 4686a0ead7ba44c13dbc4ac1f0f876d9a4d165c3
2016-02-08 14:52:48 +01:00
79dda5e840
Update LedDeviceAPA102.cpp by pcaffardi
...
Former-commit-id: e7efe8917fc10ceb860e44bbb37442cffa3512db
2016-02-07 17:40:24 +01:00
543042b870
pcaffardi/patch-1
...
Former-commit-id: 4a6737d50727518ae44f494be46a7c9c2fb54513
2016-02-07 14:52:44 +01:00
2b703de669
bugfix, config enhancement and 3 detection modes
...
Former-commit-id: edfc3e7ccf7b7d727e73a8563acb521045026d5b
2016-02-07 13:26:40 +01:00
b6060d392e
make opc channel available in via config.
...
Former-commit-id: 6a065cd049e29d7184a3aa1454de0fe1855e9941
2016-01-27 10:44:51 +01:00
a257f185c9
increase fadecandy maximum amount of leds
...
remove debug code
Former-commit-id: d74025128978e4e26d49fb57215f660bd824895b
2016-01-26 15:08:21 +01:00
bbfded147e
minor qt5 fix
...
Former-commit-id: 65ab3bb14d6a7ab52e6ab1e8eaa85321dc5fa543
2016-01-22 17:17:45 +01:00
6b052081f7
Merge pull request #460 from ntim/support_for_philips_hue
...
Transition to QNetworkAccessManager for compatibility to QT5
Former-commit-id: 07f30e86eaf0677a3199f75bf5f7c8f760822634
2016-01-21 20:49:02 +01:00
4c74b509b6
Merge pull request #462 from wisc17/blackborder
...
Blackborder Improved +
Former-commit-id: ddae8aa6e2e3f27f960d39f0e8e2ae82e39c0436
2016-01-21 20:48:46 +01:00
8f0e1f1199
switch on consistent detection only and also check right side and bottom pixel
...
Former-commit-id: 4da53a39918a3676c707215daa66d8ae263ed92a
2016-01-21 20:25:08 +01:00
93f2b8b65f
Update X11Grabber.cpp
...
Former-commit-id: ab34a0615e2233322bc2260f297130e30857ac24
2016-01-21 16:51:20 +01:00
a53f65f3a0
Update X11Grabber.cpp
...
Former-commit-id: 08b227fba33ca0f6974f10b085cf57c18e716428
2016-01-21 16:40:46 +01:00
391e2e552c
release candidate
...
Former-commit-id: e81f58386ce64f836561faf30ef2c3fb154358b5
2016-01-19 23:43:00 +01:00
6b860a7e24
Removed all QT5 switches
...
Former-commit-id: 7a481a921d572e4c0eccebfb1ba3abbab61d25fc
2016-01-18 10:41:45 +01:00
83c92703eb
Merge remote-tracking branch 'upstream/master' into support_for_philips_hue
...
Former-commit-id: 51089fb3522bf9c228d67f2c2f9a1a5b33e5d0a5
2016-01-18 10:36:20 +01:00
2a1673d8c3
Update X11Grabber.cpp
...
Former-commit-id: 849f1a2b6217b76739f84f6c9fb5645cab584f98
2016-01-17 18:04:08 +01:00
424c00e767
Merge pull request #448 from wisc17/blackborder_alternative
...
Blackborder Improved
Former-commit-id: 762bb519ebefd6755362178fdc5b9d5ed3508c3b
2016-01-13 22:43:30 +01:00
491c7c4d87
Merge pull request #445 from frostworx/master
...
added optional QT5 support - LedDevicePhilipsHue needs proper fixes
Former-commit-id: a9b0dd2af92266ad137c4a3ac05dbeec6a6c102b
2016-01-13 22:43:15 +01:00
1ca31085c7
Merge pull request #442 from redPanther/master
...
add FadeCandy/OPC device support
Former-commit-id: 6280f77551c607acb301328ce197ca357d0a8b11
2016-01-13 22:42:44 +01:00
8775b3f273
Merge pull request #428 from guddimon-/master
...
make hyperion more robust
Former-commit-id: 3d00e9be63ccd7904362d6c60702d27c282047de
2016-01-13 22:42:31 +01:00
9c1e565d33
Transition to QNetworkAccessManager for compatibility to QT5
...
Former-commit-id: 6e65da9338d131d1017051e505db8c28696adf4f
2016-01-10 22:17:59 +01:00
4bc11548b4
faster detection less false positive
...
Former-commit-id: 501de9bca4c20600fe1e6250e82143f0b0d6ade3
2016-01-10 18:42:55 +01:00
ac86a779b0
cleanup
...
Former-commit-id: 39cb3f76379990085407791ec391732c986790e6
2016-01-10 14:55:23 +01:00
544ae68429
test old v1+ vs new v2
...
Former-commit-id: 5217ac135cd0c7a6907be0097df72506ca7f2d71
2016-01-10 14:41:47 +01:00
defe217c89
added optional QT5 support - LedDevicePhilipsHue needs proper fixes
...
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
2016-01-06 17:31:23 +01:00
382f22f23c
add udp protocol support
...
Former-commit-id: a92810f14cf2af15710a38246a742ca2b94fd3bd
2016-01-06 20:40:48 +11:00
9182dd5af7
fadecandy led device:
...
implement switchOff methode
tidy up code and add doxy comments
Former-commit-id: a162e2aae756f8b74b8e65f08740c00f3c820e50
2016-01-04 14:29:47 +01:00
7f5a664864
set fadecandy default port to original fcserver port number
...
tune debug output of fadecandy device
Former-commit-id: 651459e5294ce5721ebe3bb2a6acdc1d096d9cfb
2016-01-04 12:26:06 +01:00
redpanther
tvdzwan
Danimal4326
wisc
frostworx
wisc
Paulchen-Panther
ntim
penfold42