Commit Graph

10745 Commits

Author SHA1 Message Date
Michael Liebmann
f74245d8ab Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 1dccb68ad1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 15:14:54 +01:00
Michael Liebmann
b87099f201 CKeybindSetup: Fix changeNotify call for change repeat_block...
Origin commit data
------------------
Commit: 6b8a7eb5f3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 15:14:27 +01:00
Stefan Seyfried
1b4480023b fb_accel: move hd2 specific parts from fader to fb_accel
Origin commit data
------------------
Commit: 41e420d35d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-23 15:14:27 +01:00
Stefan Seyfried
074129c8b1 rcinput: clarify comment regarding hd2 device
Origin commit data
------------------
Commit: 25165a1eaf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-23 15:14:27 +01:00
Stefan Seyfried
c09c2942c9 rcinput: add less ugly hack for crappy hd2 driver
Origin commit data
------------------
Commit: d02b29650e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-23 15:14:27 +01:00
Stefan Seyfried
8d73a24150 Revert "CRCInput::set_rc_hw: Fix device check for cs hd2"
This reverts commit f44cc16dd8.


Origin commit data
------------------
Commit: f0ab22d8b0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-23 15:14:27 +01:00
Stefan Seyfried
89a6533e4e Revert "rcinput: Add exception handling for cs hd2"
This reverts commit c2e76dcd87.

Wrong in so many ways :-)

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

Signed-off-by: M. Liebmann <git@tuxcode.de>


Origin commit data
------------------
Commit: ee9138f065
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-23 15:14:27 +01:00
vanhofen
0a6086c182 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 12:23:43 +01:00
vanhofen
40df044204 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 12:22:30 +01:00
vanhofen
daf29c0d9c neutrino.cpp: fix compiler warning; ...
msg and data is type long unsigned int, so %lu seems the right format,
but above %lX is used too and it works fine. So, what's the right one?


Origin commit data
------------------
Commit: c4aaf7678c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)

Origin message was:
------------------
- neutrino.cpp: fix compiler warning; ...

msg and data is type long unsigned int, so %lu seems the right format,
but above %lX is used too and it works fine. So, what's the right one?
2017-02-23 12:17:30 +01:00
Stefan Seyfried
c793462a06 fb_accel: move hd2 specific parts from fader to fb_accel
Origin commit data
------------------
Commit: 9287d66472
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 21:23:11 +01:00
Stefan Seyfried
7067eb94d9 rcinput: clarify comment regarding hd2 device
Origin commit data
------------------
Commit: eb6d73af7a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 20:29:51 +01:00
Stefan Seyfried
2aaab592be Revert "- rc_input: do always show key-presses in console; ..."
This reverts commit cea748fec8.


Origin commit data
------------------
Commit: 41b5d78c42
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 20:07:29 +01:00
Stefan Seyfried
3e510ae770 Merge branch 'tuxbox-fixed'
Origin commit data
------------------
Commit: 4aab7d37f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 20:06:27 +01:00
Stefan Seyfried
e496e24511 Revert "- rc_input: just cosmetics to satisfy syntax-highlighters"
This reverts commit 96eed0a6fa.


Origin commit data
------------------
Commit: 3d7f6f13c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 20:05:54 +01:00
Stefan Seyfried
fbd074d84c Revert "- rc_input: rename checkLnkDev() to checkdev_lnk(); ..."
This reverts commit 9111e53631.


Origin commit data
------------------
Commit: 63dce04974
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 20:05:26 +01:00
vanhofen
10878bc6e8 rcsim: fix perror message
Origin commit data
------------------
Commit: f0f7aec577
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rcsim: fix perror message
2017-02-22 15:25:04 +01:00
vanhofen
fbec2ca240 controlapi: fix perror message
Origin commit data
------------------
Commit: 7c2e25103f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- controlapi: fix perror message
2017-02-22 15:25:04 +01:00
vanhofen
cea748fec8 rc_input: do always show key-presses in console; ...
by mistake removed in 828e1db714


Origin commit data
------------------
Commit: 056b47c09b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rc_input: do always show key-presses in console; ...

by mistake removed in 828e1db714
2017-02-22 14:53:25 +01:00
vanhofen
96c37914bf Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: f913ae1bfa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 13:43:10 +01:00
vanhofen
d724062514 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: bdc9f4cf0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 13:42:49 +01:00
vanhofen
375b72d294 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 2b8bf025c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 13:42:39 +01:00
vanhofen
e0fbf74357 autogen.sh: add 'autoreconf -fi' call
Origin commit data
------------------
Commit: 05ed724bfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- autogen.sh: add 'autoreconf -fi' call
2017-02-22 13:41:43 +01:00
Michael Liebmann
3c745109f2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 6a2fe8dd92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 12:05:18 +01:00
Michael Liebmann
1813c2bc3c CRCInput::setKeyRepeatDelay: Change hardware dependency,
HD2 driver is not so very ugly. ;)


Origin commit data
------------------
Commit: 383af04cb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
CRCInput::setKeyRepeatDelay: Change hardware dependency,

 HD2 driver is not so very ugly. ;)
2017-02-22 12:04:58 +01:00
vanhofen
828e1db714 rc_input: we have d_printf, so let's use it
Origin commit data
------------------
Commit: 1eec78ccfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rc_input: we have d_printf, so let's use it
2017-02-22 11:50:09 +01:00
Stefan Seyfried
79117cac9c rcinput: add less ugly hack for crappy hd2 driver
Origin commit data
------------------
Commit: 844020b2fe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 11:43:37 +01:00
vanhofen
303ed0948d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: c29bc7caea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 09:01:17 +01:00
vanhofen
1035c80523 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: fdee17b5b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 09:00:45 +01:00
vanhofen
96eed0a6fa rc_input: just cosmetics to satisfy syntax-highlighters
Origin commit data
------------------
Commit: d7ed439e53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rc_input: just cosmetics to satisfy syntax-highlighters
2017-02-22 08:59:56 +01:00
vanhofen
9111e53631 rc_input: rename checkLnkDev() to checkdev_lnk(); ...
just to align form-style to latest changes


Origin commit data
------------------
Commit: 0e435bb389
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- 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
4874d63811 Revert "CRCInput::set_rc_hw: Fix device check for cs hd2"
This reverts commit f44cc16dd8.


Origin commit data
------------------
Commit: eab0a0ac0a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:46:05 +01:00
Stefan Seyfried
fc4119c351 Revert "rcinput: Add exception handling for cs hd2"
This reverts commit c2e76dcd87.

Wrong in so many ways :-)


Origin commit data
------------------
Commit: 215bf87173
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:45:37 +01:00
Stefan Seyfried
9960939337 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:44:53 +01:00
vanhofen
b72b12a375 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/neutrino.cpp


Origin commit data
------------------
Commit: 134e499be0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:33:33 +01:00
vanhofen
9f03ff9485 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 182a5ea735
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:30:13 +01:00
vanhofen
8ea61f3383 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:29:51 +01:00
Michael Liebmann
3d81065d4f Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 9209326a1b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 06:25:45 +01:00
Michael Liebmann
f44cc16dd8 CRCInput::set_rc_hw: Fix device check for cs hd2
Origin commit data
------------------
Commit: 5cac45ccb8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
b70dc32362 rcinput: remove unused/unimplemented click functions
Origin commit data
------------------
Commit: f45456d7a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
380eb92ef1 rcinput: remove now unused (and broken) getFileHandle()
Origin commit data
------------------
Commit: dceb6989a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
101ca7cc0a keybind_setup: use rcinput->setKeyRepeatDelay()
Origin commit data
------------------
Commit: 8b8b4ce0e2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
bb087750ac rcinput: fix set_rc_hw() after dynamic devices patch
...this could use some tests... :-)


Origin commit data
------------------
Commit: 41958cc029
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
862ced36e4 rcinput: add setKeyRepeatDelay() function
this allows to get rid of the broken getFileHandle function later


Origin commit data
------------------
Commit: 0df5a8df7f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-22 06:24:48 +01:00
Michael Liebmann
c2e76dcd87 rcinput: Add exception handling for cs hd2
- Supplement to previous commit


Origin commit data
------------------
Commit: 1b79faff78
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 06:24:48 +01:00
Stefan Seyfried
b6f7b80b2a 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.


Origin commit data
------------------
Commit: 7b3aa2b181
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
2017-02-22 06:24:48 +01:00
Michael Liebmann
31c041a325 Fix compiler format warnings
Origin commit data
------------------
Commit: e35969afe2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 06:24:48 +01:00
Michael Liebmann
1574c4b76f rcinput: Transfer from neutrino-mp for better compatibility
Origin commit data
------------------
Commit: d932a1a326
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 06:24:48 +01:00
Michael Liebmann
1ea4c44450 src/system/helpers.cpp: Add function readLink()
Origin commit data
------------------
Commit: 0c182785e2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 06:24:48 +01:00
vanhofen
59b2a3b072 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
2017-02-21 15:14:59 +01:00