mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-08 06:08:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,238 Commits 2 Branches 9 Tags
aebbf9682982f98bb4b5dd5adeb560191c2a4302
Commit Graph

20 Commits

Author SHA1 Message Date
vanhofen
aebbf96829 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)
 2016-09-20 08:22:22 +02:00
martii
1390156250 [experimental] timerd: adjust recording timers to epg 
Origin commit data
------------------
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)
 2016-09-15 00:48:06 +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
FlatTV
bcc4103260 Ask user for storing overlapping CI timer from epg 
Origin commit data
------------------
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)
 2016-07-10 21:44:30 +02: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
Gaucho316
a21a12ebee timerd: prevent events from being deleted while sending them to neutrino 
in neutrino's timer list sometimes appears an entry with random values
after deleting one because thread safety is not guaranteed for timerd's
event list while sending items to neutrino, so let's lock the mutex
earlier and unlock it later

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: a96fb7b7f0
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2014-02-14 (Fri, 14 Feb 2014)
 2015-02-03 17:22:42 +01:00
Stefan Seyfried
1eb4a45475 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.


Origin commit data
------------------
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-13 20:57:40 +01:00
Stefan Seyfried
e48a154e06 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.


Origin commit data
------------------
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-12 15:07:31 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
68c533a3e0 timerd/timerd: don't let getSleeptimerID return an already terminated id 
Origin commit data
------------------
Commit: 787ab2e554
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 16:36:13 +01:00
Stefan Seyfried
a16f165f19 initialize variables (mostly to silence valgrind) 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f485bceff7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)
 2013-10-01 14:00:20 +02:00
Stefan Seyfried
e6dc114395 initialize variables (mostly to silence valgrind) 
Origin commit data
------------------
Commit: e1e4a0f3a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)
 2013-09-30 20:50:31 +02:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
 2012-12-30 21:35:20 +01:00
Jacek Jendrzej
8819de8d85 never used 
Origin commit data
------------------
Commit: 1d5e7b23b3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
 2012-12-07 12:01:45 +01:00
Stefan Seyfried
9bc0f7109c neutrino: wait for timerd to avoid race on startup 
Origin commit data
------------------
Commit: 84609f22ab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 21:26:44 +01:00
Jacek Jendrzej
e9c1dad1ec fix CEC (timer record) 
Origin commit data
------------------
Commit: f7e4caac7a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)

Origin message was:
------------------
-fix CEC (timer record)
 2012-07-30 19:41:30 +02:00
[CST] Bas
e796ce8c9d timerd: fix compile after include change. 
Origin commit data
------------------
Commit: dc6925ed9a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)
 2012-03-04 15:51:22 +08:00
mws
0ed8ac5577 fix initializers and shadows 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 474790557f
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)
 2009-12-29 13:56:52 +00:00
mws
c62aa94983 Mark unused vars as comment 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
 2009-12-21 16:23:09 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
 2009-12-08 11:05:11 +00:00