mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-05 20:58:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,550 Commits 1 Branch 51 Tags
e0acbd3ddb39051bda05ea9c298adb7a900d5795
Commit Graph

66 Commits

Author SHA1 Message Date
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
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
cf1dfdad7c controlapi.cpp:revert to standard output 2012-10-22 21:28:38 +02:00
satbaby
9a2d6aea26 rc_lock: lock for rc_lock, use only once, supplement to 9e3567dc09 2012-10-22 15:52:07 +02:00
satbaby
9e3567dc09 nhttpd::controlapi.cpp:execute more comands on/off only once (fix doubleclick) 2012-10-22 14:00:01 +02: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] 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
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
c1a1aae4c1 use empty() instead of size() 2012-06-16 10:38:38 +02:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
satbaby
e023548008 never used values 2012-05-08 15:49:36 +02:00
[CST] Focus
8e06495776 comment some found not used variables 2012-05-08 16:18:16 +04:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
[CST] Focus
886ebdb146 nhttpd/tuxboxapi/coolstream/controlapi.cpp: replace Zapit->isChannelTVChannel() with CServiceManager IsChannelTVChannel() 2012-04-18 19:02:06 +04:00
Stefan Seyfried
dce95336a3 nhttpd/controlapi: don't build incompatibly licensed code 2012-04-17 19:33:59 +02:00
[CST] Bas
cac6486202 Merge branch 'dvbsi++' of 109.75.98.228:cst-private-neutrino into dvbsi++ 2012-04-13 16:24:56 +08:00
[CST] Bas
86dbdde70d Merge branch 'master' into dvbsi++ 
Conflicts:
	src/zapit/include/zapit/zapit.h
 2012-04-13 04:55:55 +08:00
[CST] Focus
b072232956 rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID 2012-04-10 14:35:09 +04:00
striper
0db5dc72a9 - yweb: add new keys (patch by FlatTV) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2202 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-04-09 09:55:42 +00:00
micha-bbg
45a2a6eab8 * Creating a screenshot added to yWeb 
- Create Screenshot: http://box/control/screenshot
  (patch by FlatTv)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2194 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-04-08 12:26:08 +00:00
satbaby
d702881157 nhttpd:-fix standby info 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2172 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-04-02 20:38:34 +00:00
[CST] Focus
2b5bc344fb nhttpd/tuxboxapi/coolstream/controlapi.cpp: remove CSectionsdClient, use direct call 2012-02-16 19:53:26 +04:00
satbaby
7df5f6394b typo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2085 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-10 14:58:21 +00:00
satbaby
6c4dfd57ae controlapi: -add relodplugins 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2084 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-10 13:33:25 +00:00
satbaby
bed601438e safter strncat & enlarged audio descriptor name length 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2005 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-26 11:03:40 +00:00
thilo
c8e76315ce *neutrino: add timeout parameter for message via web api 
based up patch by FlatTV
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/10855-nachrichten-%C3%BCber-das-yweb-mit-variablem-timeout-senden/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1782 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-28 21:57:23 +00:00
yjogol
3c2f1abd94 nhttpd: comments 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1704 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-19 17:57:08 +00:00
focus
6c6c2e9b29 Remove globals and use new zapit class members 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-18 13:35:08 +00:00
yjogol
6c6c0a6999 nhttpd: some json changes for epg 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1688 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-14 09:04:25 +00:00
yjogol
e2e1b26251 nhttpd: exchange encode with outValur for right UTF-8 in file API name 
field. Used by WebKit.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1686 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-09 18:33:03 +00:00
yjogol
3a437bb7d5 nhttpd: file API remove last comma for JSON 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1685 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-09 18:32:29 +00:00
yjogol
b151eaebf7 config API fix one comma to much 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1682 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-09 18:12:10 +00:00
yjogol
2d7b016434 getBouquet fix events 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1681 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-09 08:30:50 +00:00
yjogol
50c6361b5e nhttpd EPG details in bouquetlist for iOS-JSON-Calls 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1679 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-09 06:17:54 +00:00
yjogol
3c58647885 Remove (again r1649) global allchans, use CServiceManager. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1677 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-08 12:06:30 +00:00
yjogol
db29408b00 nhttpd reorg xml, json outputs 
add doxygen style comments api descriptions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1675 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-08 11:58:41 +00:00
focus
28382c9aa5 Remove global allchans, use CServiceManager. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1649 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-01 12:24:18 +00:00
satbaby
42fab7d679 bzero -> memset 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1277 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-09 12:40:37 +00:00
satbaby
eb70beffa4 -add mac to hwinfo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@985 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-31 15:58:03 +00:00
satbaby
7bbbb40061 -add hw info to func_get_boxtype, fixes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@983 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-31 13:24:46 +00:00
satbaby
70bff6a681 -add hwinfo to httpd info 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@977 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-30 18:32:44 +00:00
satbaby
96e7af8070 -add hwinfo to httpd info 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@976 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-30 18:28:07 +00:00
satbaby
d8489c3abc -fix set timer in findEvents 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@946 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-18 19:11:12 +00:00
satbaby
cc34491f0e fix ChannelList format 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@934 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-07 15:02:18 +00:00
satbaby
3bf282f8d4 -add reloadsetup (neutrino.conf) to nhttpd controlapi 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@849 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-10-21 06:27:59 +00:00
yjogol
384494024e nhttpd 3.3.2 Clear EPG for new retrival 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@599 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-25 12:36:57 +00:00
yjogol
1db0702932 nhttpd: extend EPG infos 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@558 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-01 10:41:07 +00:00
yjogol
c091ba4db3 nhttpd add some new configfile handling 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@543 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-04-12 05:32:20 +00:00
yjogol
a21e0de3cb nhttpd-API: Updates to GetBouquetCGI 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@541 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-04-10 05:34:28 +00:00