mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,557 Commits 2 Branches 9 Tags
db78c0676829cc19fa5425f7af2e0aa2260a24e3
Commit Graph

61 Commits

Author SHA1 Message Date
vanhofen
db78c06768 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3a34b22e10
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 01:25:09 +01:00
TangoCash
bc10689bd7 timermanager: disable autoAdjustToEPG for repeating timers 
Origin commit data
------------------
Commit: b657ef8b3c
Author: TangoCash <eric@loxat.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- timermanager: disable autoAdjustToEPG for repeating timers
 2016-11-15 21:30:12 +01:00
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:48:39 +01:00
Stefan Seyfried
95e8550dad timermanager: fix -Waddress warning with newer gcc 
The address of Events (wich is checked against NULL) can never be NULL,
because Events is passed by reference.


Origin commit data
------------------
Commit: 0531618643
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:43:55 +01:00
vanhofen
78d9f348bf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:11:37 +01:00
vanhofen
225ef6a169 timermanager: try to fix successive timers 
Origin commit data
------------------
Commit: 7c74d0bc3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- timermanager: try to fix successive timers
 2016-11-05 21:07:12 +01:00
vanhofen
510e620871 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	lib/timerdclient/timerdclient.cpp
	lib/timerdclient/timerdclient.h
	lib/timerdclient/timerdtypes.h
	src/gui/followscreenings.cpp
	src/timerd/timerd.cpp
	src/timerd/timermanager.cpp
	src/timerd/timermanager.h


Origin commit data
------------------
Commit: ff7fb885c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 14:28:47 +02:00
martii
f53433c98a timerd: honor recording safety when modifying timers (fix) 
Origin commit data
------------------
Commit: aaaa9745a7
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:57:34 +02:00
martii
3c544ff066 timerd: honor recording safety when modifying timers 
Origin commit data
------------------
Commit: 67a375f4da
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:57:34 +02:00
TangoCash
a2d979e1ab always refresh EPG for timer recordings 
Origin commit data
------------------
Commit: e86b28a50e
Author: TangoCash <eric@loxat.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
martii
9aae39eab8 timerd/timermanager: fix EPG auto-adjustment of recordings 
Origin commit data
------------------
Commit: 2cebd62aee
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
martii
6836ea5d78 timerd: adjust recording timers to epg 
Origin commit data
------------------
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)
 2016-09-26 13:04:48 +02:00
martii
7d4fb5b880 timerd/timermanager: fix EPG auto-adjustment of recordings 
Origin commit data
------------------
Commit: 659f2b372d
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)
 2016-09-15 00:51:01 +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
138af5fcaf movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-10 00:32:35 +02:00
vanhofen
8a52c8ab54 movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 6978b8c994
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-09 19:43:00 +02:00
vanhofen
2561ecf644 add/use //NI tags instead of /*NI*/; just cosmetic changes 
Origin commit data
------------------
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes
 2016-07-31 21:04:37 +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
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
958e33ddd6 some compil warning fixes 
Origin commit data
------------------
Commit: a471b2af10
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-23 (Sat, 23 Apr 2016)
 2016-04-23 21:19:04 +02:00
Jacek Jendrzej
46e5d62aa9 src/timerd/timermanager.cpp revert last change 
Origin commit data
------------------
Commit: 0bf186f256
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)
 2016-04-17 15:21:07 +02:00
Jacek Jendrzej
2f5086ec0e remove unused and some clang compil fixes 
Origin commit data
------------------
Commit: 374a172aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)
 2016-04-17 13:46:16 +02:00
vanhofen
87689bdf1e adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP 
Origin commit data
------------------
Commit: 19154192db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
 2016-03-03 11:18:15 +01:00
Gaucho316
e60b9382d8 timerd: remove unnecessary workarounds when saving events to file 
Origin commit data
------------------
Commit: c11e75846b
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)
 2015-03-16 11:55:18 +01:00
Gaucho316
fffe317df1 timerd: reset EPG ID when modifying record or zapto timer 
this ensures an up-to-date EPG ID if no EPG infos available for the
modified event during modification

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


Origin commit data
------------------
Commit: 4eb949dda0
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2014-01-19 (Sun, 19 Jan 2014)
 2015-02-03 17:22:56 +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
[CST] Focus
119268d524 timerd/timermanager.cpp: rename CONFIGFILE to TIMERDCONFIGFILE to avoid conflicts 
Origin commit data
------------------
Commit: 8952a4c79a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-15 (Thu, 15 Jan 2015)
 2015-01-15 15:26:58 +03:00
Jacek Jendrzej
062ffc5d6f add pseudo AdZap timertype 
Origin commit data
------------------
Commit: 8c7968edc4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-07 (Fri, 07 Feb 2014)

Origin message was:
------------------
-add pseudo AdZap timertype
 2014-02-07 18:05:06 +01:00
Jacek Jendrzej
1d3b10ca5b CKeyValue:: -fix get current name , fix -Wconversion in timerd 
Origin commit data
------------------
Commit: 2441171656
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-31 (Fri, 31 Jan 2014)
 2014-01-31 11:16:06 +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
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
[CST] Focus
49bcbda3a2 try to fix shutdown after wakeup, if several recordings was done, 
cancel shutdown after wakeup, if remote used, based on code (c) martii <m4rtii@gmx.de>


Origin commit data
------------------
Commit: d886a95acd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
 2013-07-30 14:10:21 +04:00
[CST] Focus
7a0710c4c2 timerd/timermanager.cpp: change default record safety to 5min 
Origin commit data
------------------
Commit: 77c9f6242c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
 2013-05-15 16:02:25 +04:00
Jacek Jendrzej
c00b998c7a CTimerManager:: don't set wekup flag if box boot from zapto timer 
Origin commit data
------------------
Commit: 1396896dd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)
 2013-05-10 17:02:11 +04:00
Jacek Jendrzej
f5648458fc use var passed by reference 
Conflicts:
	src/gui/components/cc_frm.h
	src/gui/components/cc_frm_icons.cpp


Origin commit data
------------------
Commit: b386f7bbd2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)
 2013-04-30 12:59:25 +04: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
J. Krieg
2079ead938 Neutrino: 'Port' of Neutrino-SD 'Additionally refresh EPG before recording starts' 
Patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=50004


Origin commit data
------------------
Commit: 0577329740
Author: J. Krieg <bellum07@googlemail.com>
Date: 2013-01-22 (Tue, 22 Jan 2013)
 2013-01-23 11:11:29 +01:00
Jacek Jendrzej
407f4fa3e9 neutrino: show epg infos on announce recording, supplement to 9c9febce57 
Origin commit data
------------------
Commit: c44683151e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-29 (Mon, 29 Oct 2012)

Origin message was:
------------------
 neutrino: show epg infos on announce recording, supplement to 9c9febce57
 2012-10-29 11:01:29 +01:00
[CST] Focus
934e6b8c33 remove channel_id mask for CEitManager getXXX calls 
Origin commit data
------------------
Commit: 3f5a0e5bb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
 2012-08-30 14:50:01 +04:00
[CST] Focus
8ec523e8cc use CEitManager to get EIT data 
Origin commit data
------------------
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
 2012-08-30 11:40:02 +04: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] Focus
69381ac83b timerd/timermanager.cpp: fix using invalidated after erase iterator 
Origin commit data
------------------
Commit: 1f415fb39e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
 2012-05-09 19:38:30 +04:00
Jacek Jendrzej
04be37cf14 performance Prefer prefix ++/-- operators for non-primitive types. 
Origin commit data
------------------
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)
 2012-04-28 10:56:27 +02:00
[CST] Bas
ef27988d21 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup 
Origin commit data
------------------
Commit: 2142970a35
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
 2012-03-06 12:51:31 +08: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
[CST] Focus
f2242ef2b2 timerd/timermanager.cpp: remove CSectionsdClient, use direct call 
Origin commit data
------------------
Commit: e6866f92f8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-16 (Thu, 16 Feb 2012)
 2012-02-16 20:37:41 +04:00
[CST] Focus
86c988bca7 Pass channed if with CTimerd::RecordingStopInfo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1563 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 13cc2264d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
 2011-07-21 10:08:03 +00:00
Jacek Jendrzej
423bc6f480 do not init CEC if box start in timer record mode 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1354 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 2da2aa502e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-03-30 (Wed, 30 Mar 2011)
 2011-03-30 17:41:25 +00:00
Jacek Jendrzej
8f3cd6a327 add Gaucho316 patch -> ( http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49585 ) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1208 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 31982a5ac4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-02-26 (Sat, 26 Feb 2011)

Origin message was:
------------------
-add Gaucho316 patch -> ( http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49585 )

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1208 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-26 06:09:50 +00:00
Stefan Seyfried
595a91ae58 fix merge error in last commit 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1091 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 3ac8045a6b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-30 (Sun, 30 Jan 2011)
 2011-01-30 13:18:05 +00:00