Stefan Seyfried
a409047714
Merge remote-tracking branch 'tuxbox/master'
2017-01-22 22:59:39 +01:00
Jacek Jendrzej
950963146a
src/timerd/timermanager.cpp dont unlock on other errors
2017-01-03 15:56:58 +01:00
Jacek Jendrzej
e88eeb61cd
src/timerd/timermanager.cpp fix double locking
2016-12-29 16:18:13 +01:00
Jacek Jendrzej
d0008ee905
src/timerd/timermanager.cpp sruct variable init
2016-12-04 20:04:40 +01:00
Stefan Seyfried
c6d7968381
Merge remote-tracking branch 'tuxbox/master'
2016-12-04 18:02:51 +01:00
TangoCash
bf2c9818b0
deactivate timer epg autoadjust until fixed and tested
2016-11-19 18:47:35 +01:00
TangoCash
de6f90ac27
[timers] fix start timers
2016-11-19 11:57:27 +01:00
TangoCash
a21eeea6f0
[timermanager] fix stop recordings
2016-11-18 21:25:38 +01:00
TangoCash
6128741ac2
Merge pull request #3 from neutrino-mp/master
...
move linux-dvb-headers out of the way for non-coolstream hardware
2016-11-16 21:43:53 +01:00
Stefan Seyfried
045587f6ec
make sure the private dvb headers are used on coolstream
2016-11-16 20:30:14 +01:00
TangoCash
8cb0bef8e1
timermanager: try fix autoAdjustToEPG for (repeating) timers
2016-11-16 20:09:17 +01:00
TangoCash
b657ef8b3c
- timermanager: disable autoAdjustToEPG for repeating timers
2016-11-15 21:30:12 +01:00
Stefan Seyfried
0531618643
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.
2016-11-13 01:43:55 +01:00
Stefan Seyfried
4bd8696a84
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.
2016-11-12 18:25:06 +01:00
Stefan Seyfried
2c92d112d0
Merge remote-tracking branch 'tuxbox/master'
2016-11-12 18:06:26 +01:00
svenhoefer
7c74d0bc3b
- timermanager: try to fix successive timers
2016-11-05 21:07:12 +01:00
Stefan Seyfried
13ab1ebc8a
Merge remote-tracking branch 'tuxbox/master'
...
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
martii
aaaa9745a7
timerd: honor recording safety when modifying timers (fix)
2016-09-26 13:57:34 +02:00
martii
67a375f4da
timerd: honor recording safety when modifying timers
2016-09-26 13:57:34 +02:00
TangoCash
e86b28a50e
always refresh EPG for timer recordings
2016-09-26 13:04:48 +02:00
martii
2cebd62aee
timerd/timermanager: fix EPG auto-adjustment of recordings
2016-09-26 13:04:48 +02:00
martii
c07b0f0b6c
timerd: adjust recording timers to epg
2016-09-26 13:04:48 +02:00
vanhofen
625cbb6122
- movieinfo: internally rename epgId -> channelId
2016-09-10 00:32:35 +02:00
Jacek Jendrzej
a471b2af10
some compil warning fixes
2016-04-23 21:19:04 +02:00
Jacek Jendrzej
0bf186f256
src/timerd/timermanager.cpp revert last change
2016-04-17 15:21:07 +02:00
Jacek Jendrzej
374a172aef
remove unused and some clang compil fixes
2016-04-17 13:46:16 +02:00
svenhoefer
19154192db
- adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
2016-03-03 11:18:15 +01:00
Stefan Seyfried
572de2bbcb
Merge remote-tracking branch 'cst-next'
2016-01-16 12:51:04 +01:00
Stefan Seyfried
79d800f955
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
2016-01-14 22:29:00 +01:00
Stefan Seyfried
9c2d9c8a25
make various dprintf macros safer for general usage
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2016-01-05 15:06:18 +01:00
Stefan Seyfried
6886d64578
make various dprintf macros safer for general usage
2016-01-02 10:40:42 +01:00
Stefan Seyfried
eeee5bacab
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
Christian Schuett
c11e75846b
timerd: remove unnecessary workarounds when saving events to file
2015-03-16 11:55:18 +01:00
Stefan Seyfried
66adad0811
Merge remote-tracking branch 'check/cst-next'
...
Conflicts:
src/gui/epgview.cpp
2015-02-07 23:12:01 +01:00
Christian Schuett
4eb949dda0
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 >
2015-02-03 17:22:56 +01:00
Christian Schuett
a96fb7b7f0
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 >
2015-02-03 17:22:42 +01:00
Stefan Seyfried
35c331de69
use the correct include path to the private headers
...
...and make sure they are actally used everywhere
This is the correct fix for 2e5446ad9f
2015-01-28 20:53:58 +01:00
Stefan Seyfried
b5a64e6887
Merge remote-tracking branch 'check/cst-next'
...
*needs buildfixing*
Conflicts:
src/daemonc/Makefile.am
src/daemonc/remotecontrol.cpp
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/driver/vfd.cpp
src/gui/bedit/Makefile.am
src/gui/components/Makefile.am
src/gui/luainstance.cpp
src/gui/widget/Makefile.am
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/system/Makefile.am
2015-01-26 17:26:26 +01:00
[CST] Focus
8952a4c79a
timerd/timermanager.cpp: rename CONFIGFILE to TIMERDCONFIGFILE to avoid conflicts
2015-01-15 15:26:58 +03:00
Stefan Seyfried
ecd62d81d1
Merge remote-tracking branch 'check/next-cc'
...
...only build-tested, needs fixes
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
8c7968edc4
-add pseudo AdZap timertype
2014-02-07 18:05:06 +01:00
Jacek Jendrzej
2441171656
CKeyValue:: -fix get current name , fix -Wconversion in timerd
2014-01-31 11:16:06 +01:00
Stefan Seyfried
49035cedec
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.
2014-01-13 20:57:40 +01:00
Stefan Seyfried
c68a67529c
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.
2014-01-12 15:07:31 +01:00
Stefan Seyfried
cdd065fc2e
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
2013-12-25 22:51:23 +01:00
martii
787ab2e554
timerd/timerd: don't let getSleeptimerID return an already terminated id
2013-12-22 16:36:13 +01:00
Stefan Seyfried
d244a5991a
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
Michael Liebmann
5091e920fc
Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
2013-10-17 04:22:49 +02:00
Stefan Seyfried
f485bceff7
initialize variables (mostly to silence valgrind)
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2013-10-01 14:00:20 +02:00
Stefan Seyfried
e1e4a0f3a0
initialize variables (mostly to silence valgrind)
2013-09-30 20:50:31 +02:00