Commit Graph

158 Commits

Author SHA1 Message Date
vanhofen
9351a0bf31 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
2017-09-29 08:35:05 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
2017-09-29 08:27:42 +02:00
vanhofen
0d9a80486a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:36:34 +02:00
Stefan Seyfried
9aef1ca078 rcinput: disable timer debug messages
Origin commit data
------------------
Commit: 3aebc6cf22
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
5106c1e0f7 rcinput: add hack to set rcdelay after device hotplug
this fixes e.g. wrong repeat settings after lircd restart


Origin commit data
------------------
Commit: dc9a9f90a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:50 +02:00
Stefan Seyfried
bb80e50a84 rcinput: fix corrupted iterator on input device hot-unplug
Origin commit data
------------------
Commit: ae06722b97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:50 +02:00
vanhofen
caaa8b9cc5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Origin commit data
------------------
Commit: c5e829a1d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 10:37:09 +02:00
vanhofen
8d642a4d57 fix compiler warnings in several console outputs
Origin commit data
------------------
Commit: 4b2e03d348
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- fix compiler warnings in several console outputs
2017-09-20 11:53:02 +02:00
Stefan Seyfried
834ec7c0ef rcinput: add hack to set rcdelay after device hotplug
this fixes e.g. wrong repeat settings after lircd restart


Origin commit data
------------------
Commit: ed5be5143b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)
2017-09-06 22:19:32 +02:00
Stefan Seyfried
2e78333361 rcinput: fix corrupted iterator on input device hot-unplug
Origin commit data
------------------
Commit: 36951c8141
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)
2017-09-06 22:18:41 +02:00
Stefan Seyfried
5db1afe258 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
2017-08-26 12:58:44 +02:00
Stefan Seyfried
8866526463 rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Commit: eaec2224e1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-25 14:46:25 +02:00
vanhofen
96e6ac6462 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	lib/hardware/coolstream/hardware_caps.cpp
	src/Makefile.am
	src/driver/screenshot.cpp
	src/gui/epgplus.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
2017-08-25 14:29:45 +02:00
Stefan Seyfried
845fdc1ba7 rcinput: add two more keys in the ugly azbox translate() table
Origin commit data
------------------
Commit: f8ca80e0ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-20 11:52:04 +02:00
Stefan Seyfried
3a4bb390bb rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Commit: 6ca45cb5fa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
2017-08-20 11:44:01 +02:00
vanhofen
94e386d4ac Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
2017-07-04 14:07:10 +02:00
vanhofen
a828c8a32a epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 761a2b2e73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-07-04 12:22:53 +02:00
vanhofen
fe6f8eb2b2 epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.


Origin commit data
------------------
Commit: 36a1a146fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.
2017-07-04 11:07:30 +02:00
vanhofen
85fab3c019 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 23:45:02 +01:00
Jacek Jendrzej
aaede62c71 fix PC compil
Origin commit data
------------------
Commit: 32a0fb6de4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 19:06:33 +01:00
vanhofen
4f4c656b55 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
2017-02-26 00:45:36 +01:00
Stefan Seyfried
60a2853809 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 :-)


Origin commit data
------------------
Commit: c3e5d77bfe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-25 16:07:25 +01:00
Stefan Seyfried
80b1782d62 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 :-)


Origin commit data
------------------
Commit: df4987ad84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-25 15:58:07 +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
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
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
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
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
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
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
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
Stefan Seyfried
1ed17f5a89 rcinput: remove unused/unimplemented click functions
Origin commit data
------------------
Commit: 9b8524b37b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-20 20:36:45 +01:00
Stefan Seyfried
8da51f4261 rcinput: fix set_rc_hw() after dynamic devices patch
...this could use some tests... :-)


Origin commit data
------------------
Commit: 57fa882b81
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-20 20:22:32 +01:00