Commit Graph

137 Commits

Author SHA1 Message Date
martii
fe7e8992dd timerd: honor recording safety when modifying timers (fix)
Origin commit data
------------------
Branch: ni/coolstream
Commit: aaaa9745a7
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-26 13:57:34 +02:00
martii
82a85e0817 timerd: honor recording safety when modifying timers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67a375f4da
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-26 13:57:34 +02:00
TangoCash
190283c2fc always refresh EPG for timer recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: e86b28a50e
Author: TangoCash <eric@loxat.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
martii
b22de090e0 timerd/timermanager: fix EPG auto-adjustment of recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cebd62aee
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
martii
5967b5f2c3 timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: c07b0f0b6c
Author: martii <m4rtii@gmx.de>
Date: 2016-09-26 (Mon, 26 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-26 13:04:48 +02:00
vanhofen
1eae0a97f3 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
------------------
Branch: ni/coolstream
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)



------------------
This commit was generated by Migit
2016-09-20 08:22:22 +02:00
vanhofen
d37b874b32 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 802b4bc792
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
martii
cc0e1a1586 timerd/timermanager: fix EPG auto-adjustment of recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 659f2b372d
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-15 00:51:01 +02:00
martii
2b6a4a3718 [experimental] timerd: adjust recording timers to epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe2d351750
Author: martii <m4rtii@gmx.de>
Date: 2016-09-15 (Thu, 15 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-15 00:48:06 +02:00
vanhofen
db37495d47 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
14da305c05 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6978b8c994
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-09-09 19:43:00 +02:00
vanhofen
af8fe3ebc6 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
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
FlatTV
8c47e9a1fd Ask user for storing overlapping CI timer from epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-07-10 21:44:30 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
3f94be0a5a some compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: a471b2af10
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-23 (Sat, 23 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-23 21:19:04 +02:00
Jacek Jendrzej
4e4cd473e7 src/timerd/timermanager.cpp revert last change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bf186f256
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-17 15:21:07 +02:00
Jacek Jendrzej
cd9cb4ba95 remove unused and some clang compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 374a172aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-17 13:46:16 +02:00
vanhofen
7615e8eac0 adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
Stefan Seyfried
28ab173560 Merge remote-tracking branch 'cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-16 12:51:04 +01:00
Michael Liebmann
af2ffd931b Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-16 07:22:31 +01:00
Stefan Seyfried
1364beedc3 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)

Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-14 22:29:00 +01:00
Stefan Seyfried
fd094d3359 make various dprintf macros safer for general usage
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c2d9c8a25
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-04 (Mon, 04 Jan 2016)



------------------
This commit was generated by Migit
2016-01-05 15:06:18 +01:00
Stefan Seyfried
9b94ef9eb3 make various dprintf macros safer for general usage
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6886d64578
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-02 10:40:42 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Christian Schuett
743c7beae7 timerd: remove unnecessary workarounds when saving events to file
Origin commit data
------------------
Branch: ni/coolstream
Commit: c11e75846b
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-16 11:55:18 +01:00
Stefan Seyfried
31c7317205 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-07 23:12:01 +01:00
Christian Schuett
4d92618535 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
------------------
Branch: ni/coolstream
Commit: 4eb949dda0
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-01-19 (Sun, 19 Jan 2014)



------------------
This commit was generated by Migit
2015-02-03 17:22:56 +01:00
Christian Schuett
25290a0317 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
------------------
Branch: ni/coolstream
Commit: a96fb7b7f0
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-02-14 (Fri, 14 Feb 2014)



------------------
This commit was generated by Migit
2015-02-03 17:22:42 +01:00
Stefan Seyfried
138a82d80f use the correct include path to the private headers
...and make sure they are actally used everywhere
This is the correct fix for 9715cfaba2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35c331de69
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-28 (Wed, 28 Jan 2015)



------------------
This commit was generated by Migit
2015-01-28 20:53:58 +01:00
Stefan Seyfried
2263c8bd2e 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
d9dcbeec05 timerd/timermanager.cpp: rename CONFIGFILE to TIMERDCONFIGFILE to avoid conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8952a4c79a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-15 (Thu, 15 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-15 15:26:58 +03:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
02dd8b38cb add pseudo AdZap timertype
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c7968edc4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-07 (Fri, 07 Feb 2014)

Origin message was:
------------------
-add pseudo AdZap timertype

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-07 18:05:06 +01:00
Jacek Jendrzej
f15ba92898 CKeyValue:: -fix get current name , fix -Wconversion in timerd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2441171656
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-31 (Fri, 31 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-31 11:16:06 +01:00
Stefan Seyfried
26abd01822 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
------------------
Branch: ni/coolstream
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-13 20:57:40 +01:00
Stefan Seyfried
525fd6261b 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
------------------
Branch: ni/coolstream
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
2014-01-12 15:07:31 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
martii
f2a0d3ee21 timerd/timerd: don't let getSleeptimerID return an already terminated id
Origin commit data
------------------
Branch: ni/coolstream
Commit: 787ab2e554
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-22 16:36:13 +01:00
Stefan Seyfried
971d575b78 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
Michael Liebmann
ec6bf71c64 Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-17 04:22:49 +02:00
Stefan Seyfried
018bb3b50c initialize variables (mostly to silence valgrind)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f485bceff7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)



------------------
This commit was generated by Migit
2013-10-01 14:00:20 +02:00
Stefan Seyfried
3021d0fb82 initialize variables (mostly to silence valgrind)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e1e4a0f3a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-30 20:50:31 +02:00
Stefan Seyfried
2dcc32acd2 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
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
[CST] Focus
af3bd6e922 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
------------------
Branch: ni/coolstream
Commit: d886a95acd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)



------------------
This commit was generated by Migit
2013-07-30 14:10:21 +04:00
Stefan Seyfried
4c3c21152b 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
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
[CST] Focus
0672bfd04b timerd/timermanager.cpp: change default record safety to 5min
Origin commit data
------------------
Branch: ni/coolstream
Commit: 77c9f6242c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-15 16:02:25 +04:00
Jacek Jendrzej
5d2e0aadcd CTimerManager:: don't set wekup flag if box boot from zapto timer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1396896dd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-01 (Wed, 01 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 17:02:11 +04:00
Stefan Seyfried
083bc55347 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
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00