mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,093 Commits 1 Branch 51 Tags
889c9966244c77a8a1a47d450d3512c4ee5585a0
Commit Graph

65 Commits

Author SHA1 Message Date
svenhoefer
a62267196f - vfd: re-add by mistake removed setting "off" for statusbar 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 20:39:34 +01:00
svenhoefer
62843ec241 - vfd: cleanup from unsupported hardware ifdefs; vfd.cpp/h is only used by COOL_HARDWARE 
Conflicts:
	src/driver/vfd.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-16 19:43:26 +01:00
vanhofen
6fe5d269af - add hd51; mostly ported from TangoCash's neutrino-mp 2017-10-29 18:31:30 +01:00
Stefan Seyfried
2819e651c3 Merge remote-tracking branch 'tuxbox/pu/fb-modules' 
only compile tested ;-)
 2017-02-12 21:29:10 +01:00
M. Liebmann
0d66899cbd 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
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00
GetAway
f4e334fa09 fix -Werror=misleading-indentation with newer compiler 2017-01-21 13:58:15 +01:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)
 2016-10-22 11:37:40 +02:00
svenhoefer
b56f4ed149 - vfd: allow to disable rc-lock message on vfd 2016-01-25 08:04:35 +01:00
Stefan Seyfried
f5c72d35c8 Merge remote-tracking branch 'n/cst-next-fixed' 2016-01-24 13:15:43 +01:00
svenhoefer
2eb0aed5db - rc_lock: rework class; switch to singleton; add icon; vfd-support 2016-01-20 20:26:52 +01:00
Stefan Seyfried
b5a64e6887 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
 2015-01-26 17:26:26 +01:00
svenhoefer
3fa37a6670 - vfd: fix percentOver handling 2015-01-13 10:05:12 +01:00
svenhoefer
ccf741f015 - 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
svenhoefer
90f968c19d - vfd/audioplayer: fix vfd progress in audioplayer 
don't update full vfd every second
 2015-01-09 11:18:52 +01:00
Stefan Seyfried
69c4dbbdba 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
 2014-12-25 18:03:08 +01:00
[CST] Focus
2dc3738e6b driver/vfd.cpp: fix compile on nevis 2014-10-23 10:00:40 +04:00
[CST] Bas
5f3872b5dd 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
 2014-10-22 16:14:05 +04:00
[CST] Focus
a473fe8194 webtv channels integration port, 
initial code (C) martii,
initial patch from jacek
 2014-08-27 17:32:26 +04:00
svenhoefer
649d1b1f9d - change RenderString() default to UTF8 2014-06-11 23:07:13 +02:00
svenhoefer
8b91cda918 - change getRenderWidth() default to UTF8 2014-06-11 23:07:00 +02:00
Stefan Seyfried
5e9d7878e6 vfd: fix signed-unsigned comparison warning 2014-01-23 14:17:49 +01:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
 2014-01-23 14:08:37 +01:00
[CST] Focus
3ad7175c45 driver/vfd.cpp: init timeout_cnt, to fix random vfd dimm 2014-01-23 12:26:44 +04:00
M. Liebmann
004aa84e32 SNeutrinoSettings: convert more char[...] configuration values to std::string 2014-01-19 20:57:37 +01:00
Stefan Seyfried
7d3843847a CVFD: correctly clear old text 2014-01-19 18:10:16 +01:00
Stefan Seyfried
581f1bcbf3 CVFD::ShowText: only scroll if necessary 2014-01-19 17:47:38 +01:00
Stefan Seyfried
eca8f5459b Merge remote-tracking branch 'check/next-cc' 
Conflicts:
	src/neutrino.cpp
 2014-01-19 13:37:24 +01:00
[CST] Focus
eba370d876 driver/vfd.cpp: add support to switch scroll on/off 2014-01-17 14:23:02 +04:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
svenhoefer
37e3502fb0 - movieplayer: show progress in VFD (thx Satbaby) 2013-11-15 09:18:18 +01:00
Stefan Seyfried
32de6beef0 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
 2013-09-01 19:46:10 +02:00
[CST] Focus
6f65e59e22 driver/vfd.cpp: fix typo 2013-07-18 14:52:00 +04:00
[CST] Focus
cde862081f driver/vfd.cpp: add buttons backlight control 2013-07-18 14:51:59 +04:00
Stefan Seyfried
8253c4d67c 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
 2013-05-10 10:06:47 +02:00
[CST] Bas
89bf2f6846 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/neutrino.cpp
 2012-11-13 12:51:18 +08:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
satbaby
c2052784ec src/driver/vfd.cpp: -fix ioctl error on shutdown 2012-10-29 13:24:11 +01:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...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
 2012-10-14 12:51:07 +02:00
[CST] Bas
a222240dbb Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/timerd/timermanager.cpp
 2012-09-26 17:52:47 +08:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.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/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
 2012-07-23 01:02:29 +02:00
satbaby
a8ec81b53a vfd.cpp: add timer for show servicename time switch 2012-07-12 15:35:37 +02:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
d02b1c9042 driver/vfd.cpp: init mode variable in ctor 2012-05-02 17:47:04 +04:00
Stefan Seyfried
fb6633b7aa neutrino: avoid float for percent calculations 2012-04-17 19:33:51 +02:00
satbaby
3c29473e7f 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
 2011-12-27 19:29:17 +00:00
micha-bbg
8b8b89a129 *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
micha-bbg
27690fb7a0 - 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
seife
e16b75b53d 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
 2011-06-19 20:26:11 +00:00
satbaby
aac749a682 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
 2011-05-02 10:57:53 +00:00