Commit Graph

10711 Commits

Author SHA1 Message Date
vanhofen
6d83beaf82 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33525aeafd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-25 00:15:45 +01:00
Thilo Graf
bb76d51ddc CVideoSettings: avoid unnecessary display of messageboxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: be9dd7938d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-24 (Fri, 24 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-25 00:02:52 +01:00
Thilo Graf
8a32ff690d CComponentsScrollBar: remove unnecessary debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 803253e3d4
Author: Thilo Graf <dbt@novatux.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-25 00:01:29 +01:00
Michael Liebmann
4f679de2be Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2174dde26b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-24 (Fri, 24 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-24 18:55:15 +01:00
Michael Liebmann
a8df61b3c1 neutrino: No terminate moviebrowser, menue, etc. when recording start
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0953e66d22
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-24 18:54:53 +01:00
vanhofen
565ba08c71 audioplayer: fix small typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb477aee8e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-24 (Fri, 24 Feb 2017)

Origin message was:
------------------
- audioplayer: fix small typo

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

------------------
This commit was generated by Migit
2017-02-24 18:26:07 +01:00
vanhofen
8b22f416fb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c3d44ab64
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-24 (Fri, 24 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-24 17:23:04 +01:00
Stefan Seyfried
46824f0902 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: d2408d1ade
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2017-02-24 15:53:44 +01:00
Jacek Jendrzej
22120efb2a supplement to bd6935a702, add stop msg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98afb08c5d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-24 (Fri, 24 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-24 12:30:33 +01:00
vanhofen
92f6b553ac Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a756dc791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)



------------------
This commit was generated by Migit
2017-02-23 22:17:07 +01:00
vanhofen
94e626142e followscreenings: don't show, when followlist is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: b97a3e84ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)

Origin message was:
------------------
- followscreenings: don't show, when followlist is empty

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

------------------
This commit was generated by Migit
2017-02-23 22:00:42 +01:00
vanhofen
135704be3a followscreenings: don't show, when channel_id is 0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c1e325246
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)

Origin message was:
------------------
- followscreenings: don't show, when channel_id is 0

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

------------------
This commit was generated by Migit
2017-02-23 21:49:44 +01:00
Jacek Jendrzej
bd6935a702 src/gui/widget/msgbox.cpp dont block record msg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f5778b769
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 20:41:54 +01:00
vanhofen
7611571c60 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ad27fb3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 15:25:21 +01:00
vanhofen
1d2e0f545c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8eccdc9eef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 15:25:04 +01:00
vanhofen
c9759b4c9c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c423bcb8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 15:24:49 +01:00
Michael Liebmann
d95aa92eff Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dccb68ad1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 15:14:54 +01:00
Michael Liebmann
30a4081aab CKeybindSetup: Fix changeNotify call for change repeat_block...
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b8a7eb5f3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 15:14:27 +01:00
Stefan Seyfried
b7d5b7973c fb_accel: move hd2 specific parts from fader to fb_accel
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41e420d35d
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-23 15:14:27 +01:00
Stefan Seyfried
e0cfb58ae2 rcinput: clarify comment regarding hd2 device
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25165a1eaf
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-23 15:14:27 +01:00
Stefan Seyfried
3ffe30438f rcinput: add less ugly hack for crappy hd2 driver
Origin commit data
------------------
Branch: ni/coolstream
Commit: d02b29650e
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-23 15:14:27 +01:00
Stefan Seyfried
6aba169cba Revert "CRCInput::set_rc_hw: Fix device check for cs hd2"
This reverts commit abe232fc6c.


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



------------------
This commit was generated by Migit
2017-02-23 15:14:27 +01:00
Stefan Seyfried
30e30c91f6 Revert "rcinput: Add exception handling for cs hd2"
This reverts commit 7345242772.

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
------------------
Branch: ni/coolstream
Commit: ee9138f065
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-23 15:14:27 +01:00
vanhofen
311ae84f54 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)



------------------
This commit was generated by Migit
2017-02-23 12:23:43 +01:00
vanhofen
2b3a274678 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-23 12:22:30 +01:00
vanhofen
0ad682598e 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
------------------
Branch: ni/coolstream
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?


------------------
This commit was generated by Migit
2017-02-23 12:17:30 +01:00
Stefan Seyfried
5806b3b6df fb_accel: move hd2 specific parts from fader to fb_accel
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9287d66472
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 21:23:11 +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
4d2bb004c9 rcsim: fix perror message
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0f7aec577
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- rcsim: fix perror message

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

------------------
This commit was generated by Migit
2017-02-22 15:25:04 +01:00
vanhofen
cfa00da84e controlapi: fix perror message
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c2e25103f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- controlapi: fix perror message

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

------------------
This commit was generated by Migit
2017-02-22 15:25:04 +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
vanhofen
ff829266ae Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f913ae1bfa
Author: vanhofen <vanhofen@gmx.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 13:43:10 +01:00
vanhofen
d66134ff78 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdc9f4cf0f
Author: vanhofen <vanhofen@gmx.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 13:42:49 +01:00
vanhofen
5d87140db2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b8bf025c5
Author: vanhofen <vanhofen@gmx.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 13:42:39 +01:00
vanhofen
fee0dfb99a autogen.sh: add 'autoreconf -fi' call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05ed724bfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- autogen.sh: add 'autoreconf -fi' call

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

------------------
This commit was generated by Migit
2017-02-22 13:41:43 +01:00
Michael Liebmann
d393c7f8d8 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a2fe8dd92
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 12:05:18 +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
2c2bbbc66d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c29bc7caea
Author: vanhofen <vanhofen@gmx.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 09:01:17 +01:00
vanhofen
0bb5f97300 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdee17b5b7
Author: vanhofen <vanhofen@gmx.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 09:00:45 +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