Commit Graph

31 Commits

Author SHA1 Message Date
vanhofen
d18070c663 simple_display: show scrambled icon on scrambled channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6607f0bb9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Origin message was:
------------------
- simple_display: show scrambled icon on scrambled channels

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

------------------
This commit was generated by Migit
2017-11-17 22:18:07 +01:00
vanhofen
8fcba17bc9 simple_display: allow to set scroll mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd6e0153a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- simple_display: allow to set scroll mode

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

------------------
This commit was generated by Migit
2017-11-13 21:17:36 +01:00
vanhofen
77707b782e vfd: cleanup from unsupported hardware ifdefs; vfd.cpp/h is only used by COOL_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f19ddc930
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- vfd: cleanup from unsupported hardware ifdefs; vfd.cpp/h is only used by COOL_HARDWARE

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

------------------
This commit was generated by Migit
2017-11-07 21:38:58 +01:00
vanhofen
6bca93d258 add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp

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

------------------
This commit was generated by Migit
2017-10-29 18:31:30 +01:00
Stefan Seyfried
416d98504a Merge remote-tracking branch 'tuxbox/pu/fb-modules'
only compile tested ;-)


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



------------------
This commit was generated by Migit
2017-02-12 21:29:10 +01:00
Michael Liebmann
3664527019 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


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


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +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
vanhofen
b6f1c4ef88 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-01-12 21:03:34 +01:00
vanhofen
4b98762d92 vfd/audioplayer: fix vfd progress in audioplayer
don't update full vfd every second


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


------------------
This commit was generated by Migit
2015-01-09 11:18:52 +01: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] Bas
683e1c9095 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
------------------
Branch: ni/coolstream
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)



------------------
This commit was generated by Migit
2014-10-22 16:14:05 +04:00
Stefan Seyfried
19cb443dec Merge remote-tracking branch 'check/next-cc'
Conflicts:
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2014-01-19 13:37:24 +01:00
[CST] Focus
14bd1b6244 driver/vfd.cpp: add support to switch scroll on/off
Origin commit data
------------------
Branch: ni/coolstream
Commit: eba370d876
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-17 (Fri, 17 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-17 14:23:02 +04:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
[CST] Focus
1761acbdd4 driver/vfd.cpp: add buttons backlight control
Origin commit data
------------------
Branch: ni/coolstream
Commit: cde862081f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:51:59 +04:00
Stefan Seyfried
083bc55347 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
[CST] Focus
b45d5510cf driver/vfd.h: use cs_frontpanel.h header
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3d8085f0d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 15:15:55 +04:00
[CST] Focus
08d52913ce driver/vfd.h: try to fix libcs headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 185abd1a64
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:16:57 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
Michael Liebmann
17acd0c414 Fix include path for moved header files
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files

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

------------------
This commit was generated by Migit
2012-12-13 18:09:09 +01:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
[CST] Bas
89dd15ca8f Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)



------------------
This commit was generated by Migit
2012-09-26 17:52:47 +08:00
Jacek Jendrzej
125f26f0bd vfd.cpp: add timer for show servicename time switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ec81b53a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-12 15:35:37 +02:00
Stefan Seyfried
50fede66bd neutrino: port "EPG title in LCD" from tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a99ff05934
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:45 +02:00
Jacek Jendrzej
28ec6bc669 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
------------------
Branch: ni/coolstream
Commit: 3c29473e7f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-12-27 (Tue, 27 Dec 2011)



------------------
This commit was generated by Migit
2011-12-27 19:29:17 +00:00
Stefan Seyfried
06009ddb17 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
------------------
Branch: ni/coolstream
Commit: e16b75b53d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-19 (Sun, 19 Jun 2011)



------------------
This commit was generated by Migit
2011-06-19 20:26:11 +00:00
Stefan Seyfried
e24536b01f CVFD: export getMode() even in !LCD_UPDATE case
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1343 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7ce74ff30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-03-26 (Sat, 26 Mar 2011)



------------------
This commit was generated by Migit
2011-03-26 17:07:01 +00:00
Jacek Jendrzej
5875f88614 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2011-02-07 18:53:26 +00:00
Jacek Jendrzej
67ab44d13b 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2010-08-18 16:37:00 +00:00
Jacek Jendrzej
75579069a0 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2010-08-17 16:36:21 +00:00
mrcolor
bcecfb6585 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
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00