mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 22:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,267 Commits 2 Branches 9 Tags
18469f28781243a687c81b41f8d1c300f00afb64
Commit Graph

80 Commits

Author SHA1 Message Date
vanhofen
d4545b0abd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 22:51:16 +02:00
Jacek Jendrzej
0e522bb6e6 init pre post 
Origin commit data
------------------
Commit: 4bdacf39c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
 2017-06-26 19:23:23 +02:00
vanhofen
dc9d583a77 timermanager: don't set stoptime for timers without a stop-event 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 57ff49c321
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- timermanager: don't set stoptime for timers without a stop-event

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-21 10:31:22 +02:00
vanhofen
6a4d472600 timermanager: don't set stoptime for timers without a stop-event 
Origin commit data
------------------
Commit: a0a48335b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- timermanager: don't set stoptime for timers without a stop-event
 2017-06-20 21:16:55 +02: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
vanhofen
edb884e756 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
 2017-01-05 23:07:16 +01:00
Jacek Jendrzej
48294595d4 src/timerd/timermanager.cpp dont unlock on other errors 
Origin commit data
------------------
Commit: 950963146a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-03 (Tue, 03 Jan 2017)
 2017-01-03 15:56:58 +01:00
vanhofen
62772c2c5d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/streaminfo2.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: cc07333926
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
 2016-12-30 08:25:42 +01:00
Jacek Jendrzej
73efa6256b src/timerd/timermanager.cpp fix double locking 
Origin commit data
------------------
Commit: e88eeb61cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
 2016-12-29 16:18:13 +01:00
vanhofen
8f20526f40 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: fac2d36cda
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 21:14:27 +01:00
Jacek Jendrzej
7e4147bacd src/timerd/timermanager.cpp sruct variable init 
Origin commit data
------------------
Commit: d0008ee905
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 20:04:40 +01:00
vanhofen
bf16650a53 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 9415af0801
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:12:15 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 21:11:54 +01:00
TangoCash
2b5814d438 deactivate timer epg autoadjust until fixed and tested 
Origin commit data
------------------
Commit: bf2c9818b0
Author: TangoCash <eric@loxat.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 18:47:35 +01:00
TangoCash
f5e43c4f77 [timers] fix start timers 
Origin commit data
------------------
Commit: de6f90ac27
Author: TangoCash <eric@loxat.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
 2016-11-19 11:57:27 +01:00
TangoCash
da0b9546fb [timermanager] fix stop recordings 
Origin commit data
------------------
Commit: a21eeea6f0
Author: TangoCash <eric@loxat.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)
 2016-11-18 21:25:38 +01:00
vanhofen
c29825efcc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: 506f7acbdd
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 20:17:27 +01:00
TangoCash
51969fed8f timermanager: try fix autoAdjustToEPG for (repeating) timers 
Origin commit data
------------------
Commit: 8cb0bef8e1
Author: TangoCash <eric@loxat.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)
 2016-11-16 20:09:17 +01:00
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