mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,770 Commits 1 Branch 51 Tags
2819e651c3b0e24cb432c402041427b51bcf50c7
Commit Graph

45 Commits

Author SHA1 Message Date
Stefan Seyfried
2819e651c3 Merge remote-tracking branch 'tuxbox/pu/fb-modules' 
only compile tested ;-)
 2017-02-12 21:29:10 +01:00
M. Liebmann
0cb26e6e98 Merge branch 'master' into pu/fb-modules 2017-02-12 09:24:08 +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
8b47699447 Merge remote-tracking branch 'tuxbox/master' 2017-02-11 11:18:45 +01:00
Stefan Seyfried
4134af3d1d flashtool: make CFlashVersionInfo robust against invalid input 2017-02-07 18:38:45 +01:00
svenhoefer
d925655c3b - flashtool: allow type U (update-package) 2017-02-06 21:53:51 +01:00
Stefan Seyfried
2cf2a3ed52 flashtool: make CFlashVersionInfo robust against invalid input 2017-02-04 12:12:27 +01:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
Stefan Seyfried
22dd798325 Merge remote-tracking branch 'check/cst-next' 2015-02-25 21:20:22 +01:00
[CST] Focus
16ccbafe69 system/flashtool.cpp: call saveEpg in shutdown mode, to prevent any events 2015-02-22 19:01:42 +03:00
Stefan Seyfried
d37b3c0f9a Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp
 2014-12-28 12:32:12 +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
svenhoefer
f2d08d72ac - flashtool: localize "Copy Image" string 2014-11-13 16:17:39 +01:00
[CST] Focus
0420e95b11 system/flashtool.cpp: add timestamp 2014-10-20 14:14:39 +04:00
Thilo Graf
2f0e4e1687 CProgressWindow: implement CComponent classes 
This implement window functionality from CComponentsWindow,
progress items from CProgressBar() and status text
items from CComponentsLabel()
 2014-06-23 18:43:47 +02:00
svenhoefer
014dd3ac7b Revert "- add missing include of vfd header" 
This reverts commit 3845feb0e4.
 2013-11-13 23:39:55 +01:00
svenhoefer
3845feb0e4 - add missing include of vfd header 2013-11-13 10:40:18 +01:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2013-10-21 22:58:55 +02:00
Michael Liebmann
b645b644b0 Fix compiler warnings (-Wconversion) 2013-10-10 01:58:37 +02:00
Michael Liebmann
859ef920cc CMTDInfo: Add function findMTDNumberFromName() 2013-09-28 07:29:57 +02:00
Jacek Jendrzej
7d1cb075e9 CFlashTool::program: saveEpg only if on 2013-09-05 20:59:21 +02: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
Michael Liebmann
8a5c32d0f6 Softupdate: Check the available space before copy image to /tmp on apollo 2013-08-21 06:32:17 +02:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
 2013-07-06 19:01:15 +02:00
[CST] Focus
be05be5069 system/flashtool.cpp: prevent crash on invalid mtdData access, 
ie pos = -1 if system-fs not found;
change sysfs name on apollo
 2013-06-18 16:23:51 +04:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
Michael Liebmann
c780676ce5 Software update: Copy flashimage to /tmp if it is not present in this directory 
- unmount mounted network folders before flashing
- kill timerd before flashing
 2013-06-13 01:36:03 +02:00
Michael Liebmann
c26fd64759 * Software update: Rework preparing the flash process 
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
 2013-06-08 16:20:32 +02:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
 2013-06-02 10:46:42 +04:00
Jacek Jendrzej
412d430ed0 CFlashTool::erase - shutdown sectionsd before erase flash 2013-06-01 15:04:46 +02:00
[CST] Focus
3959771c18 system/flashtool.cpp: use buffer on stack 2013-05-21 16:54:17 +04:00
Stefan Seyfried
8047f65815 flashtool: fix build on Tripledragon 2013-05-11 17:05:22 +02:00
[CST] Focus
d1cbff900f system/flashtool.cpp: fix buffer size for nor 2013-01-29 17:38:39 +04:00
[CST] Focus
e739868e7c system/flashtool.cpp: add bad block skip for read/write/erase in case of NAND 2013-01-29 14:23:50 +04:00
satbaby
9124c20f31 comment out never used 2012-08-04 10:03:19 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +04:00
satbaby
15c474a6d8 fix Wextra compil 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-09-14 17:13:29 +00:00
focus
c3897d3231 Update menu changes; setup wizard banner 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@634 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-06-19 09:55:21 +00:00
focus
d133701c83 Search mtd device to update by name 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@581 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-12 12:10:12 +00:00
satbaby
f06a3982ef fix possible Resource leak 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@249 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-01 22:21:32 +00:00
mws
474790557f fix initializers and shadows 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-29 13:56:52 +00:00
seife
732ffb18be fix more "type qualifiers ignored on function return type" warnings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@105 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-21 17:26:15 +00:00
mws
1b13da2617 Mark unused vars as comment 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-21 16:23:09 +00:00
mws
9bcbe03475 comment in unused variables, 
replace #warning statements 



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@60 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-16 15:34:26 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-08 11:05:11 +00:00