Commit Graph

132 Commits

Author SHA1 Message Date
Stefan Seyfried
e569490348 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
------------------
Branch: ni/coolstream
Commit: df4987ad84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)



------------------
This commit was generated by Migit
2017-02-25 15:58:07 +01:00
Stefan Seyfried
47d8dbc86c rcinput: clarify comment regarding hd2 device
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb6d73af7a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 20:29:51 +01:00
Stefan Seyfried
a9f91785d4 Revert "- rc_input: do always show key-presses in console; ..."
This reverts commit 27011984ef.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 41b5d78c42
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 20:07:29 +01:00
Stefan Seyfried
16d44b0f70 Merge branch 'tuxbox-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4aab7d37f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 20:06:27 +01:00
Stefan Seyfried
2614197ccd Revert "- rc_input: just cosmetics to satisfy syntax-highlighters"
This reverts commit bab85d298c.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d7f6f13c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 20:05:54 +01:00
Stefan Seyfried
0458fd217f Revert "- rc_input: rename checkLnkDev() to checkdev_lnk(); ..."
This reverts commit a0481953d0.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 63dce04974
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 20:05:26 +01:00
vanhofen
27011984ef rc_input: do always show key-presses in console; ...
by mistake removed in 41f5815172


Origin commit data
------------------
Branch: ni/coolstream
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 41f5815172


------------------
This commit was generated by Migit
2017-02-22 14:53:25 +01:00
Michael Liebmann
420efbcc4e CRCInput::setKeyRepeatDelay: Change hardware dependency,
HD2 driver is not so very ugly. ;)


Origin commit data
------------------
Branch: ni/coolstream
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. ;)


------------------
This commit was generated by Migit
2017-02-22 12:04:58 +01:00
vanhofen
41f5815172 rc_input: we have d_printf, so let's use it
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 11:50:09 +01:00
Stefan Seyfried
192b4158fe rcinput: add less ugly hack for crappy hd2 driver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 844020b2fe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 11:43:37 +01:00
vanhofen
bab85d298c rc_input: just cosmetics to satisfy syntax-highlighters
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 08:59:56 +01:00
vanhofen
a0481953d0 rc_input: rename checkLnkDev() to checkdev_lnk(); ...
just to align form-style to latest changes


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-02-22 08:59:56 +01:00
Stefan Seyfried
10321cbceb Revert "CRCInput::set_rc_hw: Fix device check for cs hd2"
This reverts commit abe232fc6c.


Origin commit data
------------------
Branch: ni/coolstream
Commit: eab0a0ac0a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 08:46:05 +01:00
Stefan Seyfried
82f67cbd02 Revert "rcinput: Add exception handling for cs hd2"
This reverts commit 7345242772.

Wrong in so many ways :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 215bf87173
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 08:45:37 +01:00
Stefan Seyfried
4635eb375c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 08:44:53 +01:00
Michael Liebmann
abe232fc6c CRCInput::set_rc_hw: Fix device check for cs hd2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5cac45ccb8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
85b82bd12f rcinput: remove unused/unimplemented click functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: f45456d7a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
8071a9d51b rcinput: fix set_rc_hw() after dynamic devices patch
...this could use some tests... :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 41958cc029
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
475c8878f8 rcinput: add setKeyRepeatDelay() function
this allows to get rid of the broken getFileHandle function later


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0df5a8df7f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Michael Liebmann
7345242772 rcinput: Add exception handling for cs hd2
- Supplement to previous commit


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b79faff78
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
b5ec2b42df 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
------------------
Branch: ni/coolstream
Commit: 7b3aa2b181
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Michael Liebmann
8c4609a9b0 rcinput: Transfer from neutrino-mp for better compatibility
Origin commit data
------------------
Branch: ni/coolstream
Commit: d932a1a326
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
Stefan Seyfried
37a8e1c9a4 rcinput: remove unused/unimplemented click functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b8524b37b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-20 20:36:45 +01:00
Stefan Seyfried
4edbd31fc2 rcinput: fix set_rc_hw() after dynamic devices patch
...this could use some tests... :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 57fa882b81
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-20 20:22:32 +01:00
Stefan Seyfried
7256f9b643 rcinput: add setKeyRepeatDelay() function
this allows to get rid of the broken getFileHandle function later


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a6dd0c46e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-20 20:20:54 +01:00
Stefan Seyfried
b6ef97d367 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
------------------
Branch: ni/coolstream
Commit: 98557462ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)



------------------
This commit was generated by Migit
2017-02-19 23:16:09 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
GetAway
4164c31d7b pzapit: add -lockrc/-unlockrc options; port from martii
I've pulled it from Duckbox-Developers/neutrino-mp-cst-next
and modified it to work


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0330515abc
Author: GetAway <get-away@t-online.de>
Date: 2016-12-11 (Sun, 11 Dec 2016)



------------------
This commit was generated by Migit
2016-12-11 20:20:02 +01:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
58b62b0445 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-09 10:42:46 +02:00
Jacek Jendrzej
00617f957a src/driver/rcinput.cpp revert (not sure)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b33d1ef38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-26 19:38:24 +02:00
Jacek Jendrzej
0c56a98b46 fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f371cc918
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-25 (Mon, 25 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-25 15:41:06 +02:00
Jacek Jendrzej
3f67f95753 avoid pssible memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d1e34a527
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-21 18:14:46 +02:00
[CST] Focus
70ea917953 nhttpd/tuxboxapi/controlapi.cpp: add direct record start for current channel
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc11a76c01
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-02 14:30:51 +03:00
vanhofen
bfdb68d9ca Revert "rcinput/neutrino: avoid the use of EVT_TIMESET"
This reverts commit 00bf8a7e92.

In some cases keys are don't used immediately:
---
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
CVFD::ShowText: [14:14]
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
2 key: 0074 value 2, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
[/.../cst-next/src/neutrino.cpp:standbyMode:3615] OFF
CSAPI (POWER-CLK): new CPU frequency: 600000000Hz
CSAPI (VIDEO): Standby 1 -> 0
CSAPI (HDMI-CEC): Power Status: STANDBY -> ON
CSAPI (HDMI-CEC): Device free (Logical Address: 03)
CSAPI (HDMI-CEC): Power Status: ON
---


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c64d2fb2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-18 (Mon, 18 Jan 2016)



------------------
This commit was generated by Migit
2016-01-18 08:10:23 +01:00
Stefan Seyfried
00bf8a7e92 rcinput/neutrino: avoid the use of EVT_TIMESET
sectionsd's EVT_TIMESET was only used to fix time calculations
for input repeat detection. I doubt this reliably worked anyway.
Just calculate an absolute input timestamp from CLOCK_MONOTONIC
and use that. Even better solution would be to use a newer
kernel with EVIOCSCLOCKID ioctl, leave that for later :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: b307b78bf8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
1adf757e65 rcinput: remove unused code, comment FIXME
I think I have mostly deciphered the meaning of this :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89f6da98f1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
3ae5bf13ba rcinput/neutrino: avoid the use of EVT_TIMESET
sectionsd's EVT_TIMESET was only used to fix time calculations
for input repeat detection. I doubt this reliably worked anyway.
Just calculate an absolute input timestamp from CLOCK_MONOTONIC
and use that. Even better solution would be to use a newer
kernel with EVIOCSCLOCKID ioctl, leave that for later :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 949e42445d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-10 16:14:10 +01:00
Stefan Seyfried
e038f84fcd rcinput: remove unused code, comment FIXME
I think I have mostly deciphered the meaning of this :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58c95460b9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-10 15:53:27 +01:00
Stefan Seyfried
e4e9fb1e46 Merge remote-tracking branch 'test/cst-next'
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
2015-02-19 14:10:26 +01:00
Jacek Jendrzej
3240811349 fix compiling warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bfcad398f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-11 19:21:54 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
c0bb459726 driver/rcinput.cpp: reset first key press only on key press event
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1398736bd8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-15 (Thu, 15 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-15 15:26:58 +03:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
[CST] Focus
3491bf1e64 neutrino, zapit: drop EVT_SCAN_REPORT_FREQUENCY,
use EVT_SCAN_REPORT_FREQUENCYP to pass full feparams,
fix scan transponder display info


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e9b71af90
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)



------------------
This commit was generated by Migit
2014-10-02 14:23:36 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
[CST] Focus
fe24da94d0 driver/rcinput.cpp: re-add shutdown after wakeup cancel,
code from commit af3bd6e922 is lost after some pick ?


Origin commit data
------------------
Branch: ni/coolstream
Commit: c359fe4eaa
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-08 (Thu, 08 May 2014)



------------------
This commit was generated by Migit
2014-05-08 12:36:56 +04:00
Stefan Seyfried
938f19d739 rcinput: fix invalid narrowing cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33d2fb319a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-05-02 (Fri, 02 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-02 09:47:42 +02:00
Stefan Seyfried
81408ea402 rcinput: fix invalid narrowing cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c11b9f0f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-27 19:25:52 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00