mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 02:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,433 Commits 2 Branches 9 Tags
c35224ff081dcd48fbe9797bceaef783cf916feb
Commit Graph

231 Commits

Author SHA1 Message Date
vanhofen
c35224ff08 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
 2017-06-10 11:43:50 +02:00
Stefan Seyfried
4930931383 set threadnames to unique values 
Origin commit data
------------------
Commit: 1e0544cd94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)
 2017-06-03 14:54:49 +02:00
vanhofen
85fab3c019 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:45:02 +01:00
Jacek Jendrzej
a31e3cfdc1 dont cal permanently settimeofday if operation not permitted 
Origin commit data
------------------
Commit: 861017a95d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 14:54:32 +01:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 16:14:33 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 10:08:13 +01:00
Michael Liebmann
6fb993ee99 Add src/compatibility.h to include software-dependency macros 
Origin commit data
------------------
Commit: 87b7260c48
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 12:35:20 +01:00
Michael Liebmann
baf881783b Fix malloc_stats() call for newer uClibc-ng versions 
Origin commit data
------------------
Commit: b58aa9ad6f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 00:34:48 +01:00
vanhofen
8d38fbe9ad Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 58811ba6dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:30:28 +01:00
vanhofen
7dbca0ba66 sectionsd: add missing include of system/set_threadname.h 
Origin commit data
------------------
Commit: 4d68318447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- sectionsd: add missing include of system/set_threadname.h
 2017-02-12 23:29:32 +01:00
vanhofen
6057caae9a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:04:09 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:01:15 +01:00
Stefan Seyfried
8107c333eb set useful thread names for all spawned threads 
Origin commit data
------------------
Commit: 5188f721c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:55:36 +01:00
Stefan Seyfried
669100d52f set useful thread names for all spawned threads 
Origin commit data
------------------
Commit: b9da7f01bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 15:17:32 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
 2017-01-22 22:59:39 +01:00
vanhofen
9f8048b3d1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
 2017-01-13 13:27:49 +01:00
vanhofen
9633f60a76 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fb15ce96de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)
 2017-01-12 13:05:31 +01:00
Jacek Jendrzej
d4224c2764 fix readepg from sectionsdcontrol :supplement to 02f848ab9a new try 
Origin commit data
------------------
Commit: 31325875db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)

Origin message was:
------------------
fix readepg from sectionsdcontrol :supplement to 02f848ab9a new try
 2017-01-11 22:15:36 +01:00
vanhofen
0b8fb6f5bd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 00c8eebe8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
 2016-12-27 16:04:31 +01:00
vanhofen
a8addbf455 Revert "fix readepg from sectionsdcontrol" 
This reverts commit 02f848ab9a.


Origin commit data
------------------
Commit: 045821729e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
 2016-12-27 09:07:19 +01:00
FlatTV
1b308ce365 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eaf2fc204a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
 2016-12-26 15:01:21 +01:00
TangoCash
02f848ab9a fix readepg from sectionsdcontrol 
to avoid permanently change of epd_dir, this would break epg read
frequently function


Origin commit data
------------------
Commit: d2ef503028
Author: TangoCash <eric@loxat.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
 2016-12-26 00:31:20 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
vanhofen
721e348728 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 00:14:20 +01:00
TangoCash
ec132fe91b add option to read saved epg data frequently 
Origin commit data
------------------
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
 2016-11-20 19:24:08 +01:00
vanhofen
ee5ff0408d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
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