Commit Graph

188 Commits

Author SHA1 Message Date
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
[CST] Focus
558fb6b242 eitd/sectionsd.cpp: disable ntpd daemonize
Origin commit data
------------------
Commit: db027d50ea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
2013-08-08 10:57:18 +04:00
[CST] Focus
4f3060bea4 eitd/sectionsd.cpp: check is /sbin/ntpdate present, use ntpd if not
Origin commit data
------------------
Commit: 28af6c810b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
2013-08-07 17:47:28 +04:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
[CST] Focus
17d0b748a2 eitd/sectionsd.cpp: wakeup threadEIT only, if case demux number is not 0 (live)
and cached events count less than max;
set full channel_id as current service for threadEIT


Origin commit data
------------------
Commit: 450099e04d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 18:46:34 +04:00
Jacek Jendrzej
e076ac5d54 CEitManager::getEventsServiceKey - simplification - THX Gaucho316
Origin commit data
------------------
Commit: 09bd2c98e9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-06-03 (Mon, 03 Jun 2013)
2013-06-03 21:37:47 +02:00
Stefan Seyfried
2bf1ef37d0 sectionsd: don't hardcode ntpdate location
Origin commit data
------------------
Commit: f5956f055d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)
2013-06-01 15:49:26 +02:00
Jacek Jendrzej
37887d1a8c eitd: addEvent - fix possible segfault if lastEvent==NULL
Origin commit data
------------------
Commit: 1a1be2a82f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-26 (Sun, 26 May 2013)
2013-05-26 18:44:52 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
2013-05-24 20:24:39 +02:00
Jacek Jendrzej
23de0a12b5 CNeutrinoEventList::findEvents - add search all epg option
Origin commit data
------------------
Commit: 35bac1ff40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)
2013-05-17 21:08:09 +02:00
Jacek Jendrzej
1c4b455438 CNeutrinoEventList::findEvents - speedup search in all channelList
Origin commit data
------------------
Commit: 63bb0996da
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
2013-05-15 14:39:09 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
Stefan Seyfried
4563a6c7f5 sectionsd: fix memleak with unused events
Origin commit data
------------------
Commit: b1e0fcb0c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-17 10:21:33 +04:00
Stefan Seyfried
bd245e45f6 sectionsd: fix memleak with unused events
Origin commit data
------------------
Commit: 3ea3f17460
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
2013-04-14 12:56:42 +02:00
Stefan Seyfried
d3531638eb neutrino: fix most hardcoded paths
Origin commit data
------------------
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 02:01:52 +01:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:57 +04:00
Stefan Seyfried
76c5b56371 sectionsd: trim CN thread debug messages
* disable DEBUG_CN_THREAD
* shorten eit update filter message
* remove unneeded printdata_ms

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 3d386649a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-06 10:15:55 +01:00
Stefan Seyfried
4e408bb7cd sectionsd: shorten debug messages
* channel ids in sectionsd are only 48bit
* addEvent debug message had redundant information

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 49f2f4e70d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-06 10:14:54 +01:00
Stefan Seyfried
40662908da sectionsd: be more tolerant about adjtime() failure
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 789d25eab0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-06 10:12:31 +01:00
Stefan Seyfried
ed31769d04 sectionsd: don't truncate 64bit value before comparing
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 4d5e7bf354
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-06 10:12:24 +01:00
Stefan Seyfried
d24f3a7d27 sectionsd: trim CN thread debug messages
* disable DEBUG_CN_THREAD
* shorten eit update filter message
* remove unneeded printdata_ms


Origin commit data
------------------
Commit: afb831a8d5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 20:31:14 +01:00
Stefan Seyfried
0941c83124 sectionsd: shorten debug messages
* channel ids in sectionsd are only 48bit
* addEvent debug message had redundant information


Origin commit data
------------------
Commit: 91c38fbf0f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 20:19:06 +01:00
Stefan Seyfried
8a6feaad91 sectionsd: be more tolerant about adjtime() failure
Origin commit data
------------------
Commit: fc3aa5949f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 19:49:21 +01:00
Stefan Seyfried
b4e89b148e sectionsd: don't truncate 64bit value before comparing
Origin commit data
------------------
Commit: d558218115
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 19:43:09 +01:00
[CST] Focus
e15f1c4c72 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
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:39:34 +04:00
Stefan Seyfried
a15fd904b8 sectionsd: add workaround for 'unusual' return codes
Origin commit data
------------------
Commit: a1f1198801
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 20:34:11 +01:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
2013-02-21 17:07:18 +01:00
Stefan Seyfried
984435d48e sectionsd: consider the table_id when inserting events
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 5db16ee2ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)
2013-02-21 15:52:13 +01:00
Stefan Seyfried
80a87017f3 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
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01:00
Michael Liebmann
b66d406771 src/eitd/sectionsd.cpp: Calling function 'Sleep()' restored
Origin commit data
------------------
Commit: 9be5730183
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-21 (Thu, 21 Feb 2013)

Origin message was:
------------------
* src/eitd/sectionsd.cpp: Calling function 'Sleep()' restored
2013-02-21 06:23:23 +01:00
Jacek Jendrzej
30fc014bd2 src/eitd/sectionsd.cpp fix compil unused variable 'rs'
Origin commit data
------------------
Commit: 1df14bd8af
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
2013-02-20 21:13:52 +01:00
Stefan Seyfried
1447812c2b sectionsd: only step time if difference is > 2min
in order to avoid unnecessary system time jumps, only step time
if the difference is bigger than 120 seconds, else use adjtime

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: c5ef1bf14c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-20 21:10:52 +01:00
Stefan Seyfried
270f8c51bf sectionsd: silence debug spam
disable some debug messages, remove unneeded newlines
from other messages

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: e7dd3083e6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-20 21:06:27 +01:00
Stefan Seyfried
8d228e95a6 sectionsd: retry getting eit_version
Sometimes at first start, the cn thread does not fetch the EIT version
and thus automatic updates don't work. The cause of this is not 100%
clear, for now let's add a workaround to try a bit longer fetching it.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: a0cefea55a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-20 21:05:38 +01:00
Stefan Seyfried
02cb17262f sectionsd: retry getting eit_version
Sometimes at first start, the cn thread does not fetch the EIT version
and thus automatic updates don't work. The cause of this is not 100%
clear, for now let's add a workaround to try a bit longer fetching it.


Origin commit data
------------------
Commit: 987dffdb87
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 17:36:19 +01:00
Stefan Seyfried
f28a151166 sectionsd: silence debug spam
disable some debug messages, remove unneeded newlines
from other messages


Origin commit data
------------------
Commit: 2f6ad23f78
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 17:35:35 +01:00
Stefan Seyfried
9a60a29016 sectionsd: speed up shutdwown of time thread
Origin commit data
------------------
Commit: c04311552a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 16:53:12 +01:00
Stefan Seyfried
bc2ded24fe sectionsd: only step time if difference is > 2min
in order to avoid unnecessary system time jumps, only step time
if the difference is bigger than 120 seconds, else use adjtime


Origin commit data
------------------
Commit: 8a883e7db3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 15:34:27 +01:00
[CST] Focus
7371c5154d Merge branch 'dvbsi++' into next
Origin commit data
------------------
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
2013-02-13 15:34:41 +04:00
Michael Liebmann
6d4c80c43a sectionsd.cpp: Remove invalid events (duration <= 1 sec.) from event list
Origin commit data
------------------
Commit: 6e9cc3d837
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-12 15:45:27 +01:00
Stefan Seyfried
4f817d58cb sectionsd: add workaround for holes in SRF EPG
Origin commit data
------------------
Commit: 1c313b43ad
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)
2013-02-05 22:43:26 +01:00
Stefan Seyfried
97d68aa6d5 sectionsd: consider the table_id when inserting events
Origin commit data
------------------
Commit: 24869930c9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)
2013-02-05 19:08:54 +01:00
[CST] Bas
953831c2c3 neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.
Origin commit data
------------------
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)
2013-01-25 10:33:40 +08:00
[CST] Focus
3105dbfcda eitd/sectionsd.cpp: fix different uclibc/glibc malloc_stats
Origin commit data
------------------
Commit: fac86b3bdb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 15:13:21 +04:00
Stefan Seyfried
4c7a4f15cc 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
------------------
Commit: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 14:05:48 +01:00
Stefan Seyfried
e52a3f2940 sectionsd: make sure housekeeping exits on shutdown
Origin commit data
------------------
Commit: c984ba37cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-15 (Mon, 15 Oct 2012)
2012-10-15 00:10:15 +02:00
Stefan Seyfried
b8702504a3 sectionsd: fix unlocked event access under high load
Origin commit data
------------------
Commit: 32597561a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 21:03:34 +02:00
[CST] Bas
8b523be32e Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Origin commit data
------------------
Commit: fbc512889f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-24 (Mon, 24 Sep 2012)
2012-09-24 15:28:48 +08:00
Jacek Jendrzej
fe47c95a54 sectionsd.cpp:-fix search mode
Origin commit data
------------------
Commit: 324a4721f4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
2012-09-16 20:15:38 +02:00
Jacek Jendrzej
932ebb7f19 sectionsd.cpp:-fix channelID
Origin commit data
------------------
Commit: c7e764f93c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
2012-09-16 16:42:26 +02:00