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

404 Commits

Author SHA1 Message Date
Stefan Seyfried
c41c7b3002 fix 64bit format string warnings 2015-01-27 10:58:43 +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
Jacek Jendrzej
2b5e7b5ba3 use empty to check string 2015-01-09 17:15:11 +01:00
Jacek Jendrzej
8023a6317b neutrino use check empty() instead of length() or size() 2015-01-03 17:51:08 +01:00
Stefan Seyfried
a92eb8f8e7 add CFLAGS for libsigc 2015-01-02 21:00:18 +01: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
41dd237498 add CFLAGS for libsigc 2014-12-25 18:11:36 +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
Jacek Jendrzej
f236b4807b nhttpd - fix select audio pid in live (vlc) mode 2014-12-23 17:45:17 +01:00
svenhoefer
069defa31c - controlapi: fix horrible typo 2014-12-06 09:36:29 +01:00
svenhoefer
3ff65299d2 - controlapi: cleanup from unused esound rests 2014-12-06 09:36:23 +01:00
Jacek Jendrzej
c8f0c68cf6 nhttpd controlapi: change for subchannel to subchannel zap 2014-11-06 14:38:30 +01:00
Christian Schuett
59ca850ecc nhttpd controlapi: allow zapping to subchannels 
based on idea by Moritz Venn <moritz.venn@freaque.net>

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>
 2014-11-05 09:20:02 +01:00
Jacek Jendrzej
847b08aedb nhttpd:controlapi.cpp fix getallsubchannels 2014-11-05 09:20:02 +01:00
martii
81ca577fb8 overload access(2) 
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp
 2014-09-24 19:50:35 +04:00
Benny
0f16c9441e add localization tag for time elapsed/remaining 2014-09-23 12:46:40 +02:00
[CST] Focus
a473fe8194 webtv channels integration port, 
initial code (C) martii,
initial patch from jacek
 2014-08-27 17:32:26 +04:00
martii
ff46970457 nttpd: allow sendfile() to cope with files >= 2GB; introduce range support 
(This re-applies most of the patches I've reverted about two hours ago.)
 2014-08-26 17:31:57 +04:00
Jacek Jendrzej
cf0bf3fa20 Revert "nhttpd: let sendfile() support files >= 2GB" 
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.
 2014-08-26 17:31:48 +04:00
martii
d71958ba8c nhttpd: let sendfile() support files >= 2GB 2014-08-26 17:31:22 +04:00
svenhoefer
8322c9e408 - neutrinoyparser: detect Zee²; fix Boxmodel for Trinity 2014-06-27 10:41:01 +02:00
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2014-04-27 19:14:06 +02:00
[CST] Focus
c78676f7fd fix warnings if some want to use c++11 2014-04-21 14:07:38 +04:00
svenhoefer
1e2290a758 - yWeb: scale channellogos in channellist and epg plus 2014-04-01 17:59:04 +02:00
svenhoefer
a3e8142fae - controlapi: add boxmodel to control/info?hwinfo 2014-03-26 13:25:06 +01:00
svenhoefer
d4dc3fcbbd - neutrinoyparser: remove delivery_system from boxname 2014-03-26 13:25:06 +01:00
svenhoefer
d81b50523c - neutrinoyparser: add function 'get_boxmodel' 2014-03-26 13:25:06 +01:00
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes
 2014-02-15 20:22:07 +01:00
Jacek Jendrzej
1e2e14e134 CControlAPI::EpgSearchXMLCGI convert channelname to xml 2014-02-13 20:12:31 +01:00
M. Liebmann
92fce346c0 yWeb: Synchronize volume/audiomute settings yWeb => GUI 2014-02-12 06:02:27 +01:00
svenhoefer
63d66538ce - CControlAPI: SignalInfoCGI: don't show description in explicit calls 2014-02-10 21:50:34 +01:00
Jacek Jendrzej
8d01e2152a CControlAPI:: -add SignalInfoCGI 2014-02-10 21:14:54 +01:00
Stefan Seyfried
65437a60a8 Merge remote-tracking branch 'broken/next-cc' 2014-01-28 13:22:00 +01:00
Jacek Jendrzej
9855a220be webif standby -add option CEC standby off (dont use TV off) 2014-01-28 10:30:29 +01:00
Stefan Seyfried
e9bc524562 Merge remote-tracking branch 'check/next-cc' 2014-01-27 21:00:18 +01:00
Jacek Jendrzej
372b367b8b supplement to 4be0273083 cec option in standby off and on 2014-01-27 20:26:46 +01:00
Jacek Jendrzej
4be0273083 -add webif option dont use CEC with standbyoff 2014-01-26 22:24:17 +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
M. Liebmann
b41819190d Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
eca8f5459b Merge remote-tracking branch 'check/next-cc' 
Conflicts:
	src/neutrino.cpp
 2014-01-19 13:37:24 +01:00
Jacek Jendrzej
59b3245680 CControlAPI::EpgSearchCGI add duration to txt output 2014-01-18 20:17:24 +01:00
Jacek Jendrzej
3f65005339 CControlAPI:: epgsearchxml fix time format 2014-01-16 18:46:51 +01:00
Jacek Jendrzej
f373f621ef CControlAPI:: -add epgsearchxml & epgsearch 2014-01-14 19:15:46 +01:00
Stefan Seyfried
07caa88ad2 timerd: rename TIMER_NEXTPROGRAM 
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
 2014-01-13 21:03:11 +01:00
Stefan Seyfried
49035cedec timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM 
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
 2014-01-13 20:57:40 +01:00
Stefan Seyfried
d1eebea381 timerd: rename TIMER_NEXTPROGRAM 
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
 2014-01-12 16:56:41 +01:00
Stefan Seyfried
c68a67529c timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM 
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
 2014-01-12 15:07:31 +01:00
Stefan Seyfried
7d379dcb30 Merge remote-tracking branch 'check/next-cc' 2013-12-29 22:12:09 +01:00
martii
0b730409ed nhttpd/controlapi: add mode=all to GetBouquetCGI 2013-12-26 13:35:01 +01:00
martii
83534791ef nhttpd/controlapi: GetBouquetsCGI: support "mode=all" (compiles, untested) 2013-12-26 13:35:01 +01:00