Commit Graph

48 Commits

Author SHA1 Message Date
TangoCash
17b3d9341b fix typo, use function for time diff
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7795f2ba6
Author: TangoCash <eric@loxat.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-10-28 13:06:12 +01:00
TangoCash
bb3818b050 fix xmltv time offsets
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e5029e75d
Author: TangoCash <eric@loxat.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-10-28 13:06:12 +01:00
vanhofen
c6319e8a8c helpers: rework new random-functions to get the code more reuseable
* introduceand use LOGODIR_TMP (storage dir for webchannel logos)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d3f66aa39
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-18 (Tue, 18 Sep 2018)

Origin message was:
------------------
- helpers: rework new random-functions to get the code more reuseable

* introduceand use LOGODIR_TMP (storage dir for webchannel logos)


------------------
This commit was generated by Migit
2018-09-18 21:18:40 +02:00
TangoCash
0ec17ca393 implement own tmp function / satify compiler
Origin commit data
------------------
Branch: ni/coolstream
Commit: 841b6efd95
Author: TangoCash <eric@loxat.de>
Date: 2018-09-02 (Sun, 02 Sep 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-09-02 01:42:51 +02:00
vanhofen
ada2fe635e eitd/sectionsdclient: unify new code and call it as it is ... it is XMLTV; ...
fix another compiler warning: the use of `tmpnam' is dangerous


Origin commit data
------------------
Branch: ni/coolstream
Commit: 04c41bfb83
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)

Origin message was:
------------------
- eitd/sectionsdclient: unify new code and call it as it is ... it is XMLTV; ...

fix another compiler warning: the use of `tmpnam' is dangerous


------------------
This commit was generated by Migit
2018-09-01 15:58:24 +02:00
TangoCash
26d32001f6 add option to read (online) xmltv epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ad9f2e35c
Author: TangoCash <eric@loxat.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-09-01 15:58:24 +02:00
vanhofen
b6954dec34 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
2017-09-25 11:41:44 +02:00
Stefan Seyfried
267ba4b9f4 change time_monotonic_ms() from time_t to int64_t
time_monotonic_ms values did wrap every ~24 days, leading to problems
in code that did not cope with that. Instead of fixing all places where
relative comparisons with time_monotonic_ms() are made, just use a
bigger datatype. Convert all users to the new type.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99ff4857ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
2017-09-23 21:35:01 +02:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
af8fe3ebc6 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
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
460ef1a766 src/eitd/xmlutil.cpp fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4fccb307c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-17 20:04:15 +02:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
[CST] Focus
075f9c4536 eitd/xmlutil.cpp: add support to read epg from directory without index.xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc52af49da
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-02 12:26:49 +03:00
[CST] Focus
ecb549c827 eitd/xmlutil.cpp: split read events code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 36cec7d41f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-06-02 12:26:17 +03:00
[CST] Focus
30abf35927 eitd/xmlutil.cpp: change event file name to match channel id order
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37a2fc42d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-26 (Tue, 26 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-26 13:27:42 +03:00
Jacek Jendrzej
c30289f3f0 add pugixml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-28 10:12:23 +02:00
Jacek Jendrzej
520c7b76c5 change check dir to check with jffs2 (mtd)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c3ecf6183
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-31 12:12:14 +02:00
Jacek Jendrzej
c7e089c9ac chhecking if epgdir directory exists for frequently save
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22399f73e2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-24 21:00:44 +01:00
Jacek Jendrzej
4ba11a0db3 xmlinterface use const char instand char
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8227a01592
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-20 12:05:22 +01:00
Jacek Jendrzej
315f5a4b4d prevent possible segfault std::string if value NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fe7fae34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-20 11:57:12 +01:00
Stefan Seyfried
fa09f58664 remove useless sync() calls
unless we had serious kernel bugs, those sync() calls
serve no useful purpose


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae21edb141
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)



------------------
This commit was generated by Migit
2015-02-25 21:43:41 +01:00
[CST] Focus
f9d5aa1b49 eitd/xmlutil.cpp: add sync() after epg save is done
Origin commit data
------------------
Branch: ni/coolstream
Commit: 839f78b9e5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-22 (Sun, 22 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-22 19:01:42 +03:00
[CST] Focus
db494a03a3 eitd: ignore neutrino epg filter, if filter was configured from xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d9e7a814d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-15 12:57:29 +03:00
[CST] Focus
b492148034 eitd: as long as neutrino using only first content classification,
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)



------------------
This commit was generated by Migit
2015-01-30 19:47:30 +03:00
[CST] Focus
7a01f2ae7d eitd: add API to configure white EPG filter
Origin commit data
------------------
Branch: ni/coolstream
Commit: 486d3692a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-22 18:58:53 +03:00
Jacek Jendrzej
85c00e412d eitd: use check empty() instead of size() or length()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e4af0b619
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-01 (Thu, 01 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-01 19:02:41 +01:00
martii
12fcc7c961 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
------------------
Branch: ni/coolstream
Commit: 0bcff8b930
Author: martii <m4rtii@gmx.de>
Date: 2014-09-14 (Sun, 14 Sep 2014)



------------------
This commit was generated by Migit
2014-09-15 10:16:30 +04:00
[CST] Focus
d0ccb2c97d Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
Stefan Seyfried
0e01a7b32c 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00
Stefan Seyfried
b082afd1e2 sectionsd: on-disk epg data has lower priority than on-air data
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a366a4ae4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)



------------------
This commit was generated by Migit
2013-02-20 21:19:05 +01:00
[CST] Bas
1e3dcd7e9a neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-25 10:33:40 +08:00
[CST] Focus
1bc9db42f7 eitd/xmlutil.cpp: fix crash, if epg data saved with older image -
item/item_description can be present and break parsing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f65f1bc80
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)



------------------
This commit was generated by Migit
2012-11-15 19:13:13 +04:00
[CST] Focus
bd702bfef8 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a0e92c0fa
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-29 (Tue, 29 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-29 16:52:50 +04:00
[CST] Focus
5146341778 eitd/SIevents.cpp: change SIcomponents and SIparentalRatings from set to vector -
no need to sort them, this decrease SIevent size


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01f50bba06
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-29 (Tue, 29 May 2012)



------------------
This commit was generated by Migit
2012-05-29 16:32:07 +04:00
[CST] Focus
9fadbf3041 eitd: ifdef unused item/itemDescription, comment unused vps in SIevent
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1cc3219c89
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-29 (Tue, 29 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-29 13:12:35 +04:00
vanhofen
cb6585b9eb eitd: fix possible buffer overflow while writing egp-data (patch by FlatTV)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eeca53fd6
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-05-24 (Thu, 24 May 2012)

Origin message was:
------------------
- eitd: fix possible buffer overflow while writing egp-data (patch by FlatTV)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-24 21:06:28 +02:00
Jacek Jendrzej
c5fa0eb3db eitd: -fix read/write epg collision
Origin commit data
------------------
Branch: ni/coolstream
Commit: 520cf0e150
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-08 13:55:47 +02:00
Jacek Jendrzej
6be2a7fbe1 xmlutil.cpp: add deleteOldfileEvents
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d620569b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-06 (Sun, 06 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-06 21:47:36 +02:00
Jacek Jendrzej
ae3c8fdb49 xmlutil.cpp:use rename instead of cp
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa2f00bcea
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-03 19:49:54 +02:00
[CST] Focus
6b14e079e0 rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID
Origin commit data
------------------
Branch: ni/coolstream
Commit: b072232956
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-10 14:35:09 +04:00
[CST] Bas
dcb46bbbe1 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce9eb10ed0
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-08 (Thu, 08 Mar 2012)



------------------
This commit was generated by Migit
2012-03-08 12:17:03 +08:00
[CST] Focus
db7e1eb1b2 eitd: unify copyright header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e1ba71ae8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-03-07 16:43:21 +04:00
[CST] Bas
25f3c22886 eitd: Fix files according to the new includes branch.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96e7c51cff
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-03-06 14:50:02 +08:00
[CST] Focus
52a08977ee eitd: save table id to xml and restore it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ed6224258
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-27 (Mon, 27 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-02-27 13:39:28 +04:00
[CST] Focus
32c07b42ca eitd: move epg filters to xmlutil.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc36b982d9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-14 (Tue, 14 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-02-14 13:25:27 +04:00
[CST] Focus
866f7acb42 eitd: rename savexml.cpp to xmlutil.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 266349e36e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-14 (Tue, 14 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-02-14 13:00:06 +04:00