Commit Graph

1619 Commits

Author SHA1 Message Date
M. Liebmann
ad47a5d5e9 CScreenShot: Remove OpenThreads and use pthread functions 2017-03-17 12:19:51 +01:00
TangoCash
81fb3b42fa Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp
2017-03-15 22:47:42 +01:00
M. Liebmann
b190e0c4ff Merge branch 'master' into pu/fb-setmode 2017-03-15 21:19:08 +01:00
Jacek Jendrzej
142ac1392f screenshot.cpp fix memcpy param overlap 2017-03-15 19:02:44 +01:00
M. Liebmann
2677543cc4 Merge branch 'master' into pu/fb-setmode 2017-03-13 21:55:50 +01:00
Jacek Jendrzej
76530e2c05 try fix segfault with --enable-cleanup 2017-03-13 19:13:37 +01:00
Jacek Jendrzej
32a0fb6de4 fix PC compil 2017-03-13 19:06:33 +01:00
svenhoefer
8bdb16cec6 Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
2017-03-13 16:14:33 +01:00
svenhoefer
5b0faeab8c - unify DetailsLine-names; move define to settings.h 2017-03-13 12:40:04 +01:00
M. Liebmann
7ad59776d1 Merge branch 'master' into pu/fb-setmode 2017-03-08 00:35:16 +01:00
Stefan Seyfried
6f1cfd42bb Merge remote-tracking branch 'tuxbox/master' 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
bfa589eb08 make neutrino compatible with new ffmpeg 2017-03-07 15:00:17 +01:00
M. Liebmann
53460e54da CFbAccelCSHD2::setMode: Fix value for screeninfo.yres_virtual 2017-03-05 19:54:09 +01:00
M. Liebmann
653e574937 osd resolution: Add 'mode' to osd_resolution_struct_t
- Use COsdSetup::OSDMODE_XXX enums to identify various resolutions
2017-02-28 15:04:09 +01:00
M. Liebmann
1fea75f428 fb_generic: Add "#define SCALE2RES_DEFINED" to check...
...presence of 'CFrameBuffer::scale2Res()'

 - Revert this patch when pu/fb-setmode branch is merged to master
2017-02-27 00:24:07 +01:00
M. Liebmann
0bc65538ac Merge branch 'master' into pu/fb-setmode 2017-02-25 16:54:06 +01:00
Stefan Seyfried
c3e5d77bfe rcinput: apply ev.time adjustment to all events
This fixes detection of keys that are allowed to be long-pressed if
"long keypress" feature is enabled.
No idea why this was applied only to key press events before :-)
2017-02-25 16:07:25 +01:00
Stefan Seyfried
df4987ad84 rcinput: apply ev.time adjustment to all events
This fixes detection of keys that are allowed to be long-pressed if
"long keypress" feature is enabled.
No idea why this was applied only to key press events before :-)
2017-02-25 15:58:07 +01:00
M. Liebmann
1dccb68ad1 Merge branch 'master' into pu/fb-setmode 2017-02-23 15:14:54 +01:00
Stefan Seyfried
41e420d35d fb_accel: move hd2 specific parts from fader to fb_accel 2017-02-23 15:14:27 +01:00
Stefan Seyfried
25165a1eaf rcinput: clarify comment regarding hd2 device 2017-02-23 15:14:27 +01:00
Stefan Seyfried
d02b29650e rcinput: add less ugly hack for crappy hd2 driver 2017-02-23 15:14:27 +01:00
Stefan Seyfried
f0ab22d8b0 Revert "CRCInput::set_rc_hw: Fix device check for cs hd2"
This reverts commit 5cac45ccb8.
2017-02-23 15:14:27 +01:00
Stefan Seyfried
ee9138f065 Revert "rcinput: Add exception handling for cs hd2"
This reverts commit 1b79faff78.

Wrong in so many ways :-)

 - The code worked perfectly. But ok, it's easier possible. ;)

Signed-off-by: M. Liebmann <git@tuxcode.de>
2017-02-23 15:14:27 +01:00
Stefan Seyfried
9287d66472 fb_accel: move hd2 specific parts from fader to fb_accel 2017-02-22 21:23:11 +01:00
Stefan Seyfried
eb6d73af7a rcinput: clarify comment regarding hd2 device 2017-02-22 20:29:51 +01:00
Stefan Seyfried
41b5d78c42 Revert "- rc_input: do always show key-presses in console; ..."
This reverts commit 056b47c09b.
2017-02-22 20:07:29 +01:00
Stefan Seyfried
4aab7d37f5 Merge branch 'tuxbox-fixed' 2017-02-22 20:06:27 +01:00
Stefan Seyfried
3d7f6f13c4 Revert "- rc_input: just cosmetics to satisfy syntax-highlighters"
This reverts commit d7ed439e53.
2017-02-22 20:05:54 +01:00
Stefan Seyfried
63dce04974 Revert "- rc_input: rename checkLnkDev() to checkdev_lnk(); ..."
This reverts commit 0e435bb389.
2017-02-22 20:05:26 +01:00
svenhoefer
056b47c09b - rc_input: do always show key-presses in console; ...
by mistake removed in 1eec78ccfd
2017-02-22 14:53:25 +01:00
M. Liebmann
6a2fe8dd92 Merge branch 'master' into pu/fb-setmode 2017-02-22 12:05:18 +01:00
M. Liebmann
383af04cb7 CRCInput::setKeyRepeatDelay: Change hardware dependency,
HD2 driver is not so very ugly. ;)
2017-02-22 12:04:58 +01:00
svenhoefer
1eec78ccfd - rc_input: we have d_printf, so let's use it 2017-02-22 11:50:09 +01:00
Stefan Seyfried
844020b2fe rcinput: add less ugly hack for crappy hd2 driver 2017-02-22 11:43:37 +01:00
svenhoefer
d7ed439e53 - rc_input: just cosmetics to satisfy syntax-highlighters 2017-02-22 08:59:56 +01:00
svenhoefer
0e435bb389 - rc_input: rename checkLnkDev() to checkdev_lnk(); ...
just to align form-style to latest changes
2017-02-22 08:59:56 +01:00
Stefan Seyfried
eab0a0ac0a Revert "CRCInput::set_rc_hw: Fix device check for cs hd2"
This reverts commit 5cac45ccb8.
2017-02-22 08:46:05 +01:00
Stefan Seyfried
215bf87173 Revert "rcinput: Add exception handling for cs hd2"
This reverts commit 1b79faff78.

Wrong in so many ways :-)
2017-02-22 08:45:37 +01:00
Stefan Seyfried
5c95139207 Merge remote-tracking branch 'tuxbox/master' 2017-02-22 08:44:53 +01:00
M. Liebmann
9209326a1b Merge branch 'master' into pu/fb-setmode 2017-02-22 06:25:45 +01:00
M. Liebmann
5cac45ccb8 CRCInput::set_rc_hw: Fix device check for cs hd2 2017-02-22 06:24:48 +01:00
Stefan Seyfried
f45456d7a8 rcinput: remove unused/unimplemented click functions 2017-02-22 06:24:48 +01:00
Stefan Seyfried
dceb6989a8 rcinput: remove now unused (and broken) getFileHandle() 2017-02-22 06:24:48 +01:00
Stefan Seyfried
41958cc029 rcinput: fix set_rc_hw() after dynamic devices patch
...this could use some tests... :-)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
0df5a8df7f rcinput: add setKeyRepeatDelay() function
this allows to get rid of the broken getFileHandle function later
2017-02-22 06:24:48 +01:00
M. Liebmann
1b79faff78 rcinput: Add exception handling for cs hd2
- Supplement to previous commit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
7b3aa2b181 rcinput: use a dynamic list of input devices
Instead of the fixed, static list of input devices, scan /dev/input/ for
proper event devices. A "good" input device is one that supports the
EVIOCGBIT ioctl and at least the EV_KEY event type.
This probably needs further fixes, e.g. in repeat rate setting code.
2017-02-22 06:24:48 +01:00
M. Liebmann
d932a1a326 rcinput: Transfer from neutrino-mp for better compatibility 2017-02-22 06:24:48 +01:00
M. Liebmann
eb0d7afa95 Merge branch 'master' into pu/fb-setmode 2017-02-21 06:39:24 +01:00