28f67871dc
More fixes
...
Former-commit-id: 331ba604dba8aa16f9cf42c5827c8542502be545
2016-03-13 13:05:47 +01:00
a5a17776d4
BugFix
...
Former-commit-id: 8887ee93d5bcaa7ee13f4f5afb601a65d59ee113
2016-03-13 12:10:54 +01:00
e4d77660a4
Bug fixes
...
Former-commit-id: a6783a75edb83988d1737df3d4a7a14c71ec4223
2016-03-13 11:59:36 +01:00
84c48b9a0a
Merge remote-tracking branch 'refs/remotes/tvdzwan/master' into test
...
Former-commit-id: 19831aa23078659d7f285b0e91bffff21a932283
2016-03-13 11:52:38 +01:00
fd2cb44b1c
merge upstream
...
Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47
2016-03-13 08:07:58 +01:00
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
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
a5e042225e
Update JsonConnection.cpp
...
Former-commit-id: 7b748e605939b65f02cb768a924faa48787618c3
2016-03-11 12:30:32 +01:00
8fce604ccb
Update JsonConnection.h
...
Former-commit-id: 5d44428cd95e2b81b867ace67eb1f77aceb47856
2016-03-11 12:29:07 +01:00
39b318e842
Update JsonConnection.h
...
Former-commit-id: 5191309bb65f446d8d60e21193ece00560d5e67b
2016-03-11 12:28:45 +01:00
8caf69e541
Update JsonConnection.h
...
Former-commit-id: fa07c01ab5bb34029d8b13ea93187a54686d784c
2016-03-11 12:21:04 +01:00
0baebe3873
Update hyperion-remote.cpp
...
Former-commit-id: bb2282e48bdd93d4dffcd763ff34e33d3f00670c
2016-03-11 12:20:59 +01:00
a25d8328f4
Update OsxWrapper.cpp
...
typooooo :D
Former-commit-id: 61df249f76c500845a460888b5f64dd70c056d28
2016-03-10 21:34:02 +01:00
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
153d1f0999
print version for every standalone grabber and hyperiond
...
Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
2016-03-10 12:01:10 +01:00
49e867f5fc
add an auto generated version id
...
Former-commit-id: df3ad6b08e24e73d957611e8be45e7e8cc717b8c
2016-03-10 06:53:21 +01:00
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
e6170ed698
create external framebuffer grabber
...
cleanup some cmakelist files
fix qt5 build
Former-commit-id: 024b5b6dc5dc96fcb16f6e8958ad3684a6728504
2016-03-09 07:03:17 +01:00
0bc725054c
make all prios settable and make prios more consistent
...
Former-commit-id: f1d1c35063e98389d627f3535d2a94da33a22da4
2016-03-08 17:31:56 +01:00
2c831c1110
add standalone amlogic grabber
...
fix standalone dispmanx grabber
Former-commit-id: 5ace9bc90a6fe76f5a51ecef95d6e7119d1102db
2016-02-24 16:03:21 +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
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
629461b944
implement proto forwarding for hyperiond internal v4l2 grabber
...
cleanup
Former-commit-id: 669f139386633e3435cdc33639134819464afd4d
2016-02-16 15:41:40 +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
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
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
4decb05348
adds ability to set static color on boot.
...
Former-commit-id: 41ca5ba73fde698d73380fac3dcee5e33b310d76
2016-01-31 22:38:30 +01:00
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
bfa4185b9a
Update hyperion-x11.cpp
...
Former-commit-id: 6fa337290c285d32a2fcc1b180c80d2849334bb8
2016-01-21 16:42:30 +01:00
3e078b2e15
Update X11Wrapper.h
...
Former-commit-id: 231123e1dee2dacf6d5225a3833f51544ca6f99c
2016-01-21 16:42:02 +01:00
66609a03a0
Update X11Wrapper.cpp
...
Former-commit-id: f644a24c77db18feb34526aa937f12700865f5be
2016-01-21 16:41:37 +01:00
defe217c89
added optional QT5 support - LedDevicePhilipsHue needs proper fixes
...
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
2016-01-06 17:31:23 +01:00
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
a3db06e90e
Demangled config naming convention is framegrabber.
...
Former-commit-id: ccb9b98f3e42785620ade9970b33d94c77b93508
2015-08-20 10:14:19 +02:00
5497fbf577
Finished the amlogic grabber for the 'WeTek Play'
...
Former-commit-id: e459cdfe6273ad2bfee92d2d190801ebdc691a5c
2015-08-20 09:51:44 +02:00
1447209846
Added tool to create screenshot for amlogic grabber
...
Former-commit-id: d403deab3f931d01bec97b726d8e70b73d3a0012
2015-08-08 08:13:37 +02:00
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
c89e1fcefa
Added frame buffer grabber support
...
Former-commit-id: a73767a1abb2cac977492bd8c6cc593fb21840e1
2015-01-18 00:04:45 +01:00
a041941e7a
Fix build with embedded protobuf library
...
Former-commit-id: 5c60566f2d4a9c65fc0fe677841a34d7ef73549a
2014-12-20 20:15:04 +01:00
12da40dc58
Fix typo
...
Former-commit-id: 134df5769b2bd608d08357c132d2a5cb1763dc4f
2014-12-17 16:18:23 +01:00
e608b11caa
Extract ImageResampler from X11Grabber
...
Former-commit-id: 63e95fa85fc0ef5a66f6eb8b396cf4b6370cf5dd
2014-12-14 14:26:59 +01:00
93de656985
fix slot name
...
Former-commit-id: fc2faf3b70be3b0a01cf3c72f7092c57e7c88783
2014-12-01 21:35:04 +01:00
0fd25285a6
add framerate parameter to X11 grabber application
...
Former-commit-id: b8f2bdb5c3e376a4505eec46204efe46dce1a6d9
2014-12-01 20:24:53 +01:00
d89f504d83
Refactor V4L2 and X11 grabbers to share more code
...
Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
2014-11-21 21:24:33 +01:00
01854a471e
Merge branch 'master' into add_x11
...
Former-commit-id: 08655bb606c5aae04fc0011a3ec1f0c16e59e7b7
2014-11-18 20:35:05 +01:00
a86e451db9
Added black color before boot-sequence, to make sure that the boot-sequence is the first thing to start
...
Former-commit-id: 575f1dfa4d2047c109d179c209c683c37028e721
2014-09-22 20:24:33 +02:00
b4d7410520
Started on adding a configurable delay in case leds are ahead of picture
...
Former-commit-id: 9eedf27c9cb51d05fca2ec2f0f9edae4726ac54d
2014-09-22 20:19:58 +02:00
3c65b82ac1
Allow disabling PROTOBUF support
...
One dependency less for users that only use DISPMANX grabbing
Former-commit-id: 24ea0480e3798bab692e75d82ddb9f5eccfa03c5
2014-09-08 16:16:02 +02:00
106257181b
Added ability to define effect arguments for the bootsequence
...
Former-commit-id: b9827bb7af6c2cfdd8b1b0388d16541612b360d4
2014-05-06 18:36:34 +02:00
b20f932ded
Merge branch 'master' into add_x11
...
Former-commit-id: 4ce19c22a28609978e1eb72375d3aa7bf63a91be
2014-04-30 22:34:36 +02:00
dd1adc4e90
Merge pull request #73 from lobocobra/patch-1
...
Fix error in start script
Former-commit-id: 6a02b865c86befa29e970a7465b256cde5335e95
2014-04-11 19:52:33 +02:00
dd0a18642b
Fix build
...
Former-commit-id: 1b98924c9d9292b6661a5c9e3e17b06813348b54
2014-03-04 23:22:46 +01:00
5e3cb497fa
Add support to set the threshold for each RGB channel separately
...
Former-commit-id: 5edb206bb2657e78f711f67625fd5f6164d8296c
2014-03-04 22:04:15 +01:00
e790cb87ca
Fix embedded V4L2 grabber
...
Former-commit-id: f9dc759a8fcac8ac95288b12a007e9c78aed82c3
2014-03-04 20:17:38 +01:00
69c64c379a
Merge branch 'master' into merge_v4l2
...
Former-commit-id: 015ff84842dc7a90ff603234ed2bb2a6afd27ab2
2014-03-01 19:47:24 +01:00
e0d405034f
Add support for Python 3
...
Former-commit-id: b6aec954ba0e79ba5697ea8cc305eb9f7d29f332
2014-02-26 18:10:17 +01:00
99fd50805c
Added image handler to v4l2 grabber to send colors to Hyperion
...
Former-commit-id: be6fb4dd8080b3325ba6161f48c093f8a145786d
2014-02-23 22:43:02 +01:00
e58f84d5c8
Merge branch 'master' into merge_v4l2
...
Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
2014-02-23 21:53:13 +01:00
22472d8f95
Added v4l2 to hyperiond (partial)
...
Former-commit-id: 06684261ec3ac7bb4e8ff0479e5b1472823648ae
2014-02-21 22:30:34 +01:00
69d6e47328
Create image callback using Qt signal
...
Former-commit-id: cf469ba01ffd26d286e6fb8d9f081cf126042e50
2014-02-19 21:52:37 +01:00
f0c35071da
Move V4L2 grabber code to separate library
...
Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc
2014-02-07 21:11:50 +01:00
fe6bfb0ad2
Missing include added
...
Former-commit-id: e8bde1967c71b2171de270b25d7474a1a528c56a
2014-02-07 15:28:14 +01:00
c5b18d5925
Removed use of qt4_use_modules from build files
...
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
2014-02-07 09:20:00 +01:00
62c1d36195
Switched added to hyperion-v4l2 to process the video stream as a 3D SBS or TAB
...
Former-commit-id: cdd121f172f4e42e301f63a3a2a51ec97ac97e3b
2014-02-04 21:53:36 +01:00
bad5b34796
Individual cropping values aded for all sides
...
Former-commit-id: 7e4013f745669bf38a9d2043731e0747d81241d5
2014-02-04 21:12:51 +01:00
2fa46fdd98
Fixed correct addres configuration
...
Former-commit-id: b001df5968f009cf9686a3741170790d82eaba1f
2014-02-02 16:58:46 +01:00
8e446bf883
Implemented the X11-grabber (based on v4l code).
...
Former-commit-id: 17ad66ff7e2a1e3fae2d853e5360f791934b6563
2014-01-30 12:35:29 +00:00
ba73fbd470
Set qt locale to 'C'
...
Former-commit-id: d2c0b2ea61c8444169a8d8635adf7af5d3b5c67b
2014-01-28 22:27:02 +01:00
6864ef6e43
Increased the timeout of grabbed images.
...
Former-commit-id: efc9d44a51ffd50e3233c6460a70335205b0c9f3
2014-01-28 08:55:54 +00:00
2d7d18b34d
Added coding framework for X11
...
Former-commit-id: 2915defe12e23d328716eade251849d40d098a8a
2014-01-28 08:47:16 +00:00
b846b0b15d
Set C locale at startup
...
Former-commit-id: 2f47a595266e5b865aa70a65bbc8d29c0c515eed
2014-01-28 00:39:04 +01:00
2085e3909f
Added creation of symbolic link /usr/bin/hyperion-v4l2 in install script
...
Former-commit-id: f45b8424968aa7ef5f0ca96cd716b6e3cf3b622a
2014-01-26 22:55:17 +01:00
ad8afb0f12
Added support for YUYV
...
Former-commit-id: 2e867b53b129af5c5f6d443a197721a3c8852a1b
2014-01-26 20:20:55 +01:00
beddd7ccc4
Changed default video standard
...
Former-commit-id: fb1452ee49b188082bdbd01c8241d451f6edc704
2014-01-26 18:02:33 +01:00
6b609fe9d7
Update program description
...
Former-commit-id: 6c6e7972e25c7eb7b3e575273cbeb91f27578f79
2014-01-26 16:34:13 +01:00
305a2e856a
Added signal detection option
...
Former-commit-id: 1bd70d02814d6238c488db765d9d25af655c1872
2014-01-26 16:00:33 +01:00
8cf39a9f6f
Added logic to reconnect after connection failure;
...
Implemented option to stop receiving the proto replies;
Former-commit-id: d8dfc3f36e81d727c4b7d449888f781b7b57c99e
2014-01-26 13:33:19 +01:00
c96be1cf38
Added option to stop receiving the proto replies
...
Former-commit-id: b15c31b8aa500b8d7253d0c2b2368eab6a11ed50
2014-01-26 13:00:23 +01:00
df9b33f560
Replaced exit statements for exceptions
...
Former-commit-id: 1eb180620fb59613eaa02da84026ffdcb28803a4
2014-01-26 12:35:31 +01:00
4f7997bbfe
Switched json to proto
...
Former-commit-id: 1a1c70b93c9b4efe17f1c1d2da246c949affa1f0
2014-01-25 21:00:48 +01:00
6723c7bf2b
Moved test/v4l2_to_png to src/hyperion-v4l2; Added json backend temporarily
...
Former-commit-id: 8c4e0ef7add8016c522d0b4c6f4df8886b905e36
2014-01-25 17:35:06 +01:00
78af2d62c2
Moved HyperCon to seperate repository
...
Former-commit-id: 89991359edc8346928cdac3c4955c25a922598ee
2014-01-10 21:04:49 +01:00
1e2d7188b1
Deleted obsolete (out-commented) code
...
Former-commit-id: a37da8b0cb38a988b467bd63b671e6b098136f72
2014-01-09 11:07:32 +00:00
efcb8ec179
Added fields to HyperCon for the 3D and screensaver check
...
Former-commit-id: a84a516c9fce8a56381fcf31852573d041699c4e
2013-12-21 15:06:01 +01:00
78795b9fa8
New XBMC checker functionality: 3D video detection (filename based) and screensaver detection
...
Former-commit-id: ea95e4ecde3ab9378bdf9c4c60950713947bd0ac
2013-12-21 14:32:30 +01:00
4fb3c5091d
Removed annoying signed unsigned warning from 'CustomParameter'
...
Former-commit-id: a02d9676953f7896972e720ed38576c9de7d86d9
2013-12-15 20:15:34 +00:00
f2253f185f
Fixed empty transform vector if failed to load settings
...
Former-commit-id: 52079c03c3c4e87160ea4e077edbadc9900e6e20
2013-12-14 21:17:32 +01:00
0cac2ce916
Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
...
Former-commit-id: 0b4fd4f95d601683433ae948f159347c34366eb4
2013-12-13 22:55:32 +01:00
20d4f00a4b
Set default indices for transform to '*'
...
Former-commit-id: 7a6e5ef61a2a54cf9ba52ba5777394c5ae5dfadd
2013-12-13 22:54:28 +01:00
89252d45d0
Added log statement for failure to start boot sequence.
...
Corrected name in default configuration file of bootsequence.
Former-commit-id: 7a303ca080f11e2bb5d72da039b9b1c1b44ddcdb
2013-12-13 18:59:01 +00:00
734759ffb3
Fixed bootsequence name (changed capital 'B' to 'b')
...
Former-commit-id: 9aaebb520371591c20cd178b843ace75f7c7e1f8
2013-12-13 19:57:25 +01:00
b124ba25d8
Removed empty argument constructor from setEffect call for bootsequence
...
Former-commit-id: cc46278cb2b9db725ae367f49464d361ce06e670
2013-12-13 15:00:56 +00:00
2efd751c76
Removed bootsequence library
...
Former-commit-id: 5f3f927236a26ae00299a8e7a914e98ace3b328a
2013-12-13 14:55:34 +00:00
a20dcbfe8c
Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine
...
Former-commit-id: c7f7fe4307f7dfaddaef23b71c6ead3491d0e669
2013-12-13 09:06:19 +01:00
2eaae36858
Added maximum duration to boot sequence config
...
Former-commit-id: b390e9431365ffd710e0c4f72143cc65caf55530
2013-12-13 09:05:25 +01:00
de7f340123
Merge branch 'add_effect_engine' of https://github.com/tvdzwan/hyperion into add_effect_engine
...
Former-commit-id: 505461722259be6884e475a9a0783ba95280b8a6
2013-12-13 00:01:59 +01:00
c11808878f
Hyperion-remote changed to support multiple colors in the setColor command
...
Former-commit-id: f0acda054056d6fa937e9cbd2b22686979911bc9
2013-12-13 00:01:48 +01:00
91f09eceb0
Updated the device selection with specific sub panels per device type.
...
Former-commit-id: 312ffdb3213c4e3698477f117adb739cbcc6a941
2013-12-12 22:54:14 +01:00
b7e91b7013
Updated HyperCon with effect configuration removed.
...
Former-commit-id: 721510af90c601954390b881f957224725a7fed9
2013-12-12 22:39:56 +01:00
AEtHeLsYn
redpanther
Serhan
tvdzwan
Paulchen-Panther
frostworx
Gamadril
poljvd
Floris Bos
Marc Dahlem
Johan
johan