Commit Graph

14 Commits

Author SHA1 Message Date
redPanther 945f3d1c5b big code cleanup. mostly line endings and indentions (#659)
No functional changes - except protobuffer is mandatory and not optional now.

Former-commit-id: 1e6347e708707cc388cdedb8d0352a9f017030b8
2016-05-26 23:44:27 +02:00
Paulchen-Panther 409ef383f3 XRender support for X11 Grabber (#649)
* Update X11Grabber.h

* Update X11Grabber.cpp

* Update CMakeLists.txt

* Update hyperion-x11.cpp

* Update X11Wrapper.cpp

* Update X11Wrapper.h


Former-commit-id: d2f7cb0e22248a0c2963bf53728f2e0d7bb9dee1
2016-05-24 19:55:50 +02: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 153d1f0999 print version for every standalone grabber and hyperiond
Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
2016-03-10 12:01:10 +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
Paulchen-Panther bfa4185b9a Update hyperion-x11.cpp
Former-commit-id: 6fa337290c285d32a2fcc1b180c80d2849334bb8
2016-01-21 16:42:30 +01:00
poljvd 12da40dc58 Fix typo
Former-commit-id: 134df5769b2bd608d08357c132d2a5cb1763dc4f
2014-12-17 16:18:23 +01:00
poljvd e608b11caa Extract ImageResampler from X11Grabber
Former-commit-id: 63e95fa85fc0ef5a66f6eb8b396cf4b6370cf5dd
2014-12-14 14:26:59 +01:00
poljvd 93de656985 fix slot name
Former-commit-id: fc2faf3b70be3b0a01cf3c72f7092c57e7c88783
2014-12-01 21:35:04 +01:00
poljvd 0fd25285a6 add framerate parameter to X11 grabber application
Former-commit-id: b8f2bdb5c3e376a4505eec46204efe46dce1a6d9
2014-12-01 20:24:53 +01:00
poljvd d89f504d83 Refactor V4L2 and X11 grabbers to share more code
Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
2014-11-21 21:24:33 +01:00
johan b20f932ded Merge branch 'master' into add_x11
Former-commit-id: 4ce19c22a28609978e1eb72375d3aa7bf63a91be
2014-04-30 22:34:36 +02:00
T. van der Zwan 2fa46fdd98 Fixed correct addres configuration
Former-commit-id: b001df5968f009cf9686a3741170790d82eaba1f
2014-02-02 16:58:46 +01:00
T. van der Zwan 8e446bf883 Implemented the X11-grabber (based on v4l code).
Former-commit-id: 17ad66ff7e2a1e3fae2d853e5360f791934b6563
2014-01-30 12:35:29 +00:00