mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,569 Commits 1 Branch 51 Tags
c388c7029e29716d4a087c3762dbd931784c80c5
Commit Graph

93 Commits

Author SHA1 Message Date
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
d886a95acd try to fix shutdown after wakeup, if several recordings was done, 
cancel shutdown after wakeup, if remote used, based on code (c) martii <m4rtii@gmx.de>
 2013-07-30 14:10:21 +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
[CST] Focus
77c9f6242c timerd/timermanager.cpp: change default record safety to 5min 2013-05-15 16:02:25 +04:00
Jacek Jendrzej
1396896dd1 CTimerManager:: don't set wekup flag if box boot from zapto timer 2013-05-10 17:02:11 +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
Jacek Jendrzej
6ba280261b CTimerManager:: don't set wekup flag if box boot from zapto timer 2013-05-01 22:00:03 +02:00
Jacek Jendrzej
b386f7bbd2 use var passed by reference 
Conflicts:
	src/gui/components/cc_frm.h
	src/gui/components/cc_frm_icons.cpp
 2013-04-30 12:59:25 +04:00
Jacek Jendrzej
ddc9229efc use var passed by reference 2013-04-18 19:19:30 +02:00
Stefan Seyfried
4dbeb3a31e neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2013-02-21 15:47:18 +01:00
Stefan Seyfried
7e701bfefc Merge branch 'uncool/dvbsi++' commit 1320462626 
Conflicts:
	src/eitd/SIevents.cpp
 2013-01-29 21:27:41 +01:00
bellum
0577329740 Neutrino: 'Port' of Neutrino-SD 'Additionally refresh EPG before recording starts' 
Patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=50004
 2013-01-23 11:11:29 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
satbaby
1d5e7b23b3 never used 2012-12-07 12:01:45 +01:00
Stefan Seyfried
84609f22ab neutrino: wait for timerd to avoid race on startup 2012-11-03 21:26:44 +01:00
Stefan Seyfried
e0acbd3ddb neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2012-11-03 14:05:48 +01:00
satbaby
c44683151e neutrino: show epg infos on announce recording, supplement to 654ca3656d 2012-10-29 11:01:29 +01:00
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
[CST] Focus
27d47c52c0 timerd/Makefile.am: add include path 2012-08-30 11:32:54 +04:00
satbaby
f7e4caac7a -fix CEC (timer record) 2012-07-30 19:41:30 +02:00
[CST] Focus
1f415fb39e timerd/timermanager.cpp: fix using invalidated after erase iterator 2012-05-09 19:38:30 +04:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
micha-bbg
f36ee26d87 * Add missing $(top_builddir) to Makefile.am 2012-04-27 16:54:01 +01:00
[CST] Bas
2142970a35 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup 2012-03-06 12:51:31 +08:00
[CST] Bas
dc6925ed9a timerd: fix compile after include change. 2012-03-04 15:51:22 +08:00
[CST] Focus
e6866f92f8 timerd/timermanager.cpp: remove CSectionsdClient, use direct call 2012-02-16 20:37:41 +04:00
focus
13cc2264d7 Pass channed if with CTimerd::RecordingStopInfo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1563 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 10:08:03 +00:00
satbaby
2da2aa502e do not init CEC if box start in timer record mode 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1354 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-30 17:41:25 +00:00
satbaby
31982a5ac4 -add Gaucho316 patch -> ( http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49585 ) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1208 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 06:09:50 +00:00
seife
3ac8045a6b fix merge error in last commit 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1091 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 13:18:05 +00:00
seife
64d231f3c6 timerd: do not use wakeup settings on TD 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1086 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 12:28:21 +00:00
satbaby
5408966cd0 add deepstandby.off/on script 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1080 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-28 12:38:32 +00:00
satbaby
386afa1245 fix close & osd 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@846 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-10-19 10:02:44 +00:00
focus
08a941af26 Testing timer wakeup fixes for NEO 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@741 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-09-01 17:39:39 +00:00
focus
56674d5561 Fixes for non-standart icon sizes. Not complete yet, work in progress. Probably will broke commit #568 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@569 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-06 09:39:29 +00:00
focus
1ec1b2fb81 #286, 288, 285, 242, 282, 296, 293 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@549 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-04-21 09:36:33 +00:00
satbaby
d10aa99002 -fix timer conf 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@370 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-18 12:22:38 +00:00
satbaby
5fe3e4af83 -fix announce_Time shadow fix, unused OutputFd 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@286 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-06 19:09:07 +00:00
satbaby
615258c0a3 -fix rest of shadow warnings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@275 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-06 16:59:49 +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
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
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