vanhofen
5df8b0409e
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/fonts/Makefile.am
src/gui/cam_menu.cpp
src/gui/update.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
7e9107c8a8
neutrino: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
vanhofen
45544364d2
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 92bf7c73f7
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-22 (Sun, 22 Jan 2017)
2017-01-22 21:22:49 +01:00
GetAway
dad4073c4b
fix -Werror=misleading-indentation with newer compiler
...
Origin commit data
------------------
Commit: f4e334fa09
Author: GetAway <get-away@t-online.de >
Date: 2017-01-21 (Sat, 21 Jan 2017)
2017-01-21 13:58:15 +01:00
vanhofen
4cf2b60722
NI \o/
...
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
vanhofen
d886545b9f
vfd: allow to disable rc-lock message on vfd
...
Origin commit data
------------------
Commit: b56f4ed149
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-01-25 (Mon, 25 Jan 2016)
Origin message was:
------------------
- vfd: allow to disable rc-lock message on vfd
2016-01-25 08:04:35 +01:00
vanhofen
2a442ac22f
rc_lock: rework class; switch to singleton; add icon; vfd-support
...
Origin commit data
------------------
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-01-20 (Wed, 20 Jan 2016)
Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support
2016-01-20 20:26:52 +01:00
vanhofen
2a97182b35
vfd: fix percentOver handling
...
Origin commit data
------------------
Commit: 3fa37a6670
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-01-13 (Tue, 13 Jan 2015)
Origin message was:
------------------
- vfd: fix percentOver handling
2015-01-13 10:05:12 +01:00
vanhofen
249e909b23
vfd: fix progress-bar in audio mode; ...
...
... don't accept periodic changes from infoviewer
- vfd: allow volume-bar in menu mode and audio mode
Origin commit data
------------------
Commit: ccf741f015
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-01-12 (Mon, 12 Jan 2015)
Origin message was:
------------------
- vfd: fix progress-bar in audio mode; ...
... don't accept periodic changes from infoviewer
- vfd: allow volume-bar in menu mode and audio mode
2015-01-12 21:03:34 +01:00
vanhofen
2dfe72b2f4
vfd/audioplayer: fix vfd progress in audioplayer
...
don't update full vfd every second
Origin commit data
------------------
Commit: 90f968c19d
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-01-09 (Fri, 09 Jan 2015)
Origin message was:
------------------
- vfd/audioplayer: fix vfd progress in audioplayer
don't update full vfd every second
2015-01-09 11:18:52 +01:00
[CST] Focus
bedc3d699b
driver/vfd.cpp: fix compile on nevis
...
Origin commit data
------------------
Commit: 2dc3738e6b
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-10-23 (Thu, 23 Oct 2014)
2014-10-23 10:00:40 +04:00
[CST] Bas
8f536ee896
neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me.
...
Conflicts:
src/daemonc/remotecontrol.cpp
src/gui/channellist.cpp
Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2014-09-26 (Fri, 26 Sep 2014)
2014-10-22 16:14:05 +04:00
[CST] Focus
8f7f3f9e4d
webtv channels integration port,
...
initial code (C) martii,
initial patch from jacek
Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-08-27 (Wed, 27 Aug 2014)
2014-08-27 17:32:26 +04:00
vanhofen
98c0a441d8
change RenderString() default to UTF8
...
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-06-11 (Wed, 11 Jun 2014)
Origin message was:
------------------
- change RenderString() default to UTF8
2014-06-11 23:07:13 +02:00
vanhofen
3bba3094e2
change getRenderWidth() default to UTF8
...
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-06-11 (Wed, 11 Jun 2014)
Origin message was:
------------------
- change getRenderWidth() default to UTF8
2014-06-11 23:07:00 +02:00
[CST] Focus
072ac5a089
driver/vfd.cpp: init timeout_cnt, to fix random vfd dimm
...
Origin commit data
------------------
Commit: 3ad7175c45
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 12:26:44 +04:00
Michael Liebmann
3e96126769
SNeutrinoSettings: convert more char[...] configuration values to std::string
...
Origin commit data
------------------
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-18 (Sat, 18 Jan 2014)
2014-01-19 20:57:37 +01:00
[CST] Focus
fe60822847
driver/vfd.cpp: add support to switch scroll on/off
...
Origin commit data
------------------
Commit: eba370d876
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-01-17 (Fri, 17 Jan 2014)
2014-01-17 14:23:02 +04:00
vanhofen
cf1caa7d7c
movieplayer: show progress in VFD (thx Satbaby)
...
Origin commit data
------------------
Commit: 37e3502fb0
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-15 (Fri, 15 Nov 2013)
Origin message was:
------------------
- movieplayer: show progress in VFD (thx Satbaby)
2013-11-15 09:18:18 +01:00
[CST] Focus
1aefd84182
driver/vfd.cpp: fix typo
...
Origin commit data
------------------
Commit: 6f65e59e22
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-07-18 (Thu, 18 Jul 2013)
2013-07-18 14:52:00 +04:00
[CST] Focus
0e30a1f501
driver/vfd.cpp: add buttons backlight control
...
Origin commit data
------------------
Commit: cde862081f
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-07-18 (Thu, 18 Jul 2013)
2013-07-18 14:51:59 +04:00
[CST] Bas
747783c85f
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2012-11-13 (Tue, 13 Nov 2012)
2012-11-13 12:51:18 +08:00
Jacek Jendrzej
e0388860f9
src/driver/vfd.cpp: -fix ioctl error on shutdown
...
Origin commit data
------------------
Commit: c2052784ec
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-10-29 (Mon, 29 Oct 2012)
2012-10-29 13:24:11 +01:00
[CST] Bas
8965dc519f
Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
...
Conflicts:
src/timerd/timermanager.cpp
Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2012-09-26 (Wed, 26 Sep 2012)
2012-09-26 17:52:47 +08:00
Jacek Jendrzej
4f8551defa
vfd.cpp: add timer for show servicename time switch
...
Origin commit data
------------------
Commit: a8ec81b53a
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-07-12 (Thu, 12 Jul 2012)
2012-07-12 15:35:37 +02:00
Jacek Jendrzej
67903dc13b
use empty() instead of size()
...
Origin commit data
------------------
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-06-16 (Sat, 16 Jun 2012)
Origin message was:
------------------
use empty() instead of size()
2012-06-16 09:44:42 +02:00
[CST] Focus
77cb4df15c
driver/vfd.cpp: init mode variable in ctor
...
Origin commit data
------------------
Commit: d02b1c9042
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-05-02 (Wed, 02 May 2012)
2012-05-02 17:47:04 +04:00
Jacek Jendrzej
b3a6068126
vfd: use wake_up instead of setMode for turn on LCD
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2009 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 3c29473e7f
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-12-27 (Tue, 27 Dec 2011)
2011-12-27 19:29:17 +00:00
Michael Liebmann
73c4a2f2da
Fix LED/VFD indication in time shift (r1828)
...
- Changes resulted to sometimes crash neutrino, this patch fixes it.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1846 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 8b8b89a129
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2011-11-14 (Mon, 14 Nov 2011)
Origin message was:
------------------
*Fix LED/VFD indication in time shift (r1828)
- Changes resulted to sometimes crash neutrino, this patch fixes it.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1846 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-14 21:59:48 +00:00
Michael Liebmann
ab44938c90
Fix LED/VFD indication in time shift.
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1828 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 27690fb7a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2011-11-05 (Sat, 05 Nov 2011)
Origin message was:
------------------
- Fix LED/VFD indication in time shift.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1828 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-05 13:44:38 +00:00
Stefan Seyfried
be8a2d37b9
CVFD: make ShowText() use const char* to avoid ugly casts
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1549 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: e16b75b53d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-06-19 (Sun, 19 Jun 2011)
2011-06-19 20:26:11 +00:00
Jacek Jendrzej
d40975bd0c
vfd: rework vfd menu (use ItemSlider), vfdcontroler deprecated
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1420 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: aac749a682
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-05-02 (Mon, 02 May 2011)
2011-05-02 10:57:53 +00:00
Jacek Jendrzej
76b98d2f10
trigger vfd time in standby
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1313 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: dae995437a
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-03-19 (Sat, 19 Mar 2011)
2011-03-19 11:59:11 +00:00
Jacek Jendrzej
895cf5505a
add lcd menu option: show channalname or clock
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1237 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 790ec8170c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-03-02 (Wed, 02 Mar 2011)
Origin message was:
------------------
-add lcd menu option: show channalname or clock
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1237 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-02 14:14:50 +00:00
Stefan Seyfried
4dafc4e869
CVFD: remove debug output
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1173 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 98eb3b0774
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-02-20 (Sun, 20 Feb 2011)
2011-02-20 16:54:06 +00:00
Jacek Jendrzej
cd28d844f1
LEDs ( blinke blinke ;) )
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1150 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: f049a627f3
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-02-11 (Fri, 11 Feb 2011)
2011-02-11 11:51:15 +00:00
Jacek Jendrzej
7128a74276
add menu for led record
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1116 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: d00ac262ae
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-02-07 (Mon, 07 Feb 2011)
Origin message was:
------------------
-add menu for led record
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1116 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-07 18:53:26 +00:00
[CST] Focus
683a2054d6
Testing pmt update while recording fix
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1095 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 43d4d88e40
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2011-01-30 (Sun, 30 Jan 2011)
2011-01-30 14:00:26 +00:00
[CST] Focus
6e8d329918
Remove some globals from vcrcontrol
...
- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: ab0f7f731c
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2011-01-25 (Tue, 25 Jan 2011)
Origin message was:
------------------
- Remove some globals from vcrcontrol
- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-25 17:22:38 +00:00
Jacek Jendrzej
3f2f40148c
compil fix
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@908 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: eb393f7857
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-11-28 (Sun, 28 Nov 2010)
2010-11-28 14:19:08 +00:00
[CST] Focus
ec2b5e0d17
Testing VBI, new libcoolstream needed
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@796 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 41234dbfb5
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-09-23 (Thu, 23 Sep 2010)
2010-09-23 15:44:11 +00:00
Jacek Jendrzej
53cb5af881
led menu enlarge
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@726 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: c669bb863f
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-08-19 (Thu, 19 Aug 2010)
2010-08-19 12:10:01 +00:00
Jacek Jendrzej
d9e8daa177
add led on/off menu
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@725 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: d88dece038
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-08-18 (Wed, 18 Aug 2010)
Origin message was:
------------------
-add led on/off menu
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@725 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-18 16:37:00 +00:00
Jacek Jendrzej
8706f19237
add deepStandby brightness menu for neo
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@724 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 6a549a7290
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-08-17 (Tue, 17 Aug 2010)
Origin message was:
------------------
-add deepStandby brightness menu for neo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@724 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-17 16:36:21 +00:00
mws
0ed8ac5577
fix initializers and shadows
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 474790557f
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)
2009-12-29 13:56:52 +00:00
mws
c62aa94983
Mark unused vars as comment
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 16:23:09 +00:00
mrcolor
cb8dd3394d
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00