mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 07:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,458 Commits 2 Branches 9 Tags
4e3f663b97178235a06b3a9723d40f10a43bccdc
Commit Graph

253 Commits

Author SHA1 Message Date
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
5fbc92695c eitd : fix add ExtendedTextCache option 
Origin commit data
------------------
Commit: 797fd44a35
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-20 (Wed, 20 Apr 2016)
 2016-04-20 12:54:27 +02:00
Stefan Seyfried
6ed1a21764 sectionsd: try to improve cnthread update filter logic 
Origin commit data
------------------
Commit: 0bc1ad6abb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)
 2016-01-24 11:44:10 +01:00
Stefan Seyfried
9d960cc2d9 sectionsd: try to improve "good time" detection logic 
Origin commit data
------------------
Commit: 70e0543382
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 16:43:51 +01:00
Stefan Seyfried
93c0ecdb8e sectionsd: revert "do not adjtime() if less than one second" 
This is actaully not that useful and add unnecessary complexity.


Origin commit data
------------------
Commit: c4e42e82f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 16:42:19 +01:00
Michael Liebmann
f4436ad010 Fix merge conflict in src/eitd/sectionsd.cpp 
Origin commit data
------------------
Commit: 75498935ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)
 2016-01-16 07:26:04 +01:00
Michael Liebmann
d329d7fe60 sectionsd.cpp: Fix error 'heap-use-after-free' reported by AddressSanitizer 
Origin commit data
------------------
Commit: e2f282ccc9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-12 (Tue, 12 Jan 2016)
 2016-01-16 07:26:04 +01:00
Michael Liebmann
3c98408295 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 07:22:31 +01:00
Stefan Seyfried
98d017a7c1 sectionsd: fix possibly fishy localtime_r usage 
Origin commit data
------------------
Commit: 364dd41655
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
3962e8bb21 sectionsd: improve timeThread info messages 
Origin commit data
------------------
Commit: b67062b62e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
c459aa5155 sectionsd: try to avoid setting bogus time 
I recently saw spurious cases of the DVB time being off 30 minutes.
I am still investigating if this is a driver issue or something else,
but for now, if the time diff is bigger than 120 seconds, ask for
a second opinion about the current dvb time before stepping the clock.
Additionally, ignore time differences of less than one second (the
granularity of DVB time stamps is one second anyway)


Origin commit data
------------------
Commit: e85565fd96
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 16:00:27 +01:00
Stefan Seyfried
6a9f9c43dc sectionsd: fix possibly fishy localtime_r usage 
Origin commit data
------------------
Commit: 4b6673dd91
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 14:02:03 +01:00
Stefan Seyfried
d7ca911770 sectionsd: improve timeThread info messages 
Origin commit data
------------------
Commit: dfc8905601
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-09 (Sat, 09 Jan 2016)
 2016-01-09 20:54:28 +01:00
Stefan Seyfried
d83f6ea51f sectionsd: fix signed/unsigned comparison warning 
Origin commit data
------------------
Commit: f98501b5b1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-09 (Sat, 09 Jan 2016)
 2016-01-09 20:53:56 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
Jacek Jendrzej
302b27db38 eitd: add and move viasat to extra switch 
Origin commit data
------------------
Commit: 06ab9d186b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-09 (Sun, 09 Aug 2015)
 2015-08-09 17:54:31 +02:00
Jacek Jendrzej
e70004443e src/gui/eventlist.cpp -add fsk filter to epg-search 
Origin commit data
------------------
Commit: 81049d89cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-01 (Wed, 01 Jul 2015)
 2015-07-01 21:39:20 +02:00
Jacek Jendrzej
cf384796b6 src/gui/eventlist.cpp-add program category filter to epg-search 
Origin commit data
------------------
Commit: 39796eda68
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-06-30 (Tue, 30 Jun 2015)
 2015-06-30 14:23:39 +02:00
[CST] Focus
a53169c3ad eitd/sectionsd.cpp: fix ntp_system_cmd when config updated from GUI 
Origin commit data
------------------
Commit: 5611d65c66
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-05 (Fri, 05 Jun 2015)
 2015-06-05 17:13:43 +03:00
[CST] Focus
3bba62c49f eitd/sectionsd.cpp: fix ntp_system_cmd in case ntpdate not found 
Origin commit data
------------------
Commit: b91347e99a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-05 (Fri, 05 Jun 2015)
 2015-06-05 16:26:42 +03:00
[CST] Focus
6d5af8bc88 eitd/sectionsd.cpp: remove useless IS_WEBTV check on event channel id 
Origin commit data
------------------
Commit: b230f63d85
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)
 2015-06-02 12:26:44 +03:00
TangoCash
fb75e9bac2 add VIASAT EPG based on martii 
Origin commit data
------------------
Commit: eb81369965
Author: TangoCash <eric@loxat.de>
Date: 2015-05-13 (Wed, 13 May 2015)
 2015-05-15 03:46:50 +02:00
Thilo Graf
9d2a06d506 CTimeThread: sectionsd.cpp: use thread save localtime_r 
Origin commit data
------------------
Commit: 76ca33de9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-12 (Mon, 12 Jan 2015)
 2015-03-29 22:40:04 +02:00
Thilo Graf
58adcbcfae CEitManager: use unified binary search for ntp 
Origin commit data
------------------
Commit: d58679f42d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-08 (Mon, 08 Dec 2014)
 2015-03-29 22:40:00 +02:00
Jacek Jendrzej
89422c761a chhecking if epgdir directory exists for frequently save 
Origin commit data
------------------
Commit: 22399f73e2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
 2015-03-24 21:00:44 +01:00
Stefan Seyfried
4c9e098a4f set threadnames to unique values 
Origin commit data
------------------
Commit: fca14b17c5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)
 2015-02-28 10:53:18 +01:00
Stefan Seyfried
ba11c68361 sectionsd: disable debug messages 
Origin commit data
------------------
Commit: fd666960c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)
 2015-02-22 00:47:41 +01:00
Stefan Seyfried
9d599887b2 sectionsd: silence debug output 
Origin commit data
------------------
Commit: 884f43b948
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)
 2015-02-21 12:54:57 +01:00
Stefan Seyfried
7b9f11df7e Merge remote-tracking branch 'test/cst-next' 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
 2015-02-19 14:10:26 +01:00
[CST] Focus
22210b9fdc eitd: ignore neutrino epg filter, if filter was configured from xml 
Origin commit data
------------------
Commit: 5d9e7a814d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
 2015-02-15 12:57:29 +03:00
Stefan Seyfried
30eb1a1ced Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-02-07 23:12:01 +01:00
[CST] Focus
96c523a0c2 eitd: as long as neutrino using only first content classification, 
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)
 2015-01-30 19:47:30 +03:00
Stefan Seyfried
a968a12b8d 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


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
[CST] Focus
0032c56bac eitd: add API to configure white EPG filter 
Origin commit data
------------------
Commit: 486d3692a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)
 2015-01-22 18:58:53 +03:00
[CST] Focus
a75181470c eitd/sectionsd.cpp: bugfix after bb10dced7e: 
neutrino do set current channel to 0 in standby, too


Origin commit data
------------------
Commit: d0593a5572
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-08 (Thu, 08 Jan 2015)
 2015-01-08 16:17:41 +03:00
[CST] Focus
bb10dced7e eitd/sectionsd.cpp: do not wakeup epg scan on service stop 
Origin commit data
------------------
Commit: ad9bf009da
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-05 (Mon, 05 Jan 2015)
 2015-01-05 13:52:40 +03:00
Jacek Jendrzej
ac5daf2dd9 eitd: use check empty() instead of size() or length() 
Origin commit data
------------------
Commit: 8e4af0b619
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-01 (Thu, 01 Jan 2015)
 2015-01-01 19:02:41 +01:00
Stefan Seyfried
d1e2143fd6 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


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 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


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
8f2687c0dd eitd/sectionsd.cpp: try to fix filter restart on service stop 
Origin commit data
------------------
Commit: f816efadc6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)
 2014-12-23 19:08:01 +03:00
[CST] Focus
1706e2851c eitd/sectionsd.cpp: fix busywait loop after service stop 
Origin commit data
------------------
Commit: c4a8d40853
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
 2014-12-05 14:44:48 +03:00
vanhofen
b718defbe0 add epg_save_frequently feature ... 
... to provide the EPG data in frequently intervals on an external device


Origin commit data
------------------
Commit: e21a79195e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)

Origin message was:
------------------
- add epg_save_frequently feature ...

... to provide the EPG data in frequently intervals on an external device
 2014-12-05 09:08:56 +01:00
[CST] Focus
9f8752b2be gui/miscsettings_menu.cpp: fix settings sectionsd config 
Origin commit data
------------------
Commit: 320c3b163c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)
 2014-10-20 11:16:14 +04:00
martii
0973d86ff9 eitd: Reduce sectionsd memory requirements: 
* Various EPG related strings (language- and country keys, audio descriptions) come with a pretty low variance. Cache them, and use an index instead of allocating redundant strings for each and every SIevent.
* Storing content classifications in native format instead of std::string removes quite some memory overhead, too.

This saves about 250 bytes of RAM for every event cached, resulting in a considerably reduced sectionsd memory footprint.

Conflicts:
	src/eitd/xmlutil.cpp


Origin commit data
------------------
Commit: 0bcff8b930
Author: martii <m4rtii@gmx.de>
Date: 2014-09-14 (Sun, 14 Sep 2014)
 2014-09-15 10:16:30 +04:00
[CST] Focus
3738250243 neutrino: stop EIT read before zap 
Origin commit data
------------------
Commit: 3513f9830a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
 2014-09-02 12:59:21 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
Stefan Seyfried
3f36062fe7 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


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00