vanhofen
2a64edef4f
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/nhttpd/Makefile.am
Origin commit data
------------------
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 23:43:57 +01:00
Stefan Seyfried
24d2ccfea6
make sure the private dvb headers are used on coolstream
...
Origin commit data
------------------
Commit: 045587f6ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-11-16 (Wed, 16 Nov 2016)
2016-11-16 20:30:14 +01:00
vanhofen
6cbee866fd
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 11:41:02 +02:00
TangoCash
985775b93c
add possibility to add Name,Url,Port, Username and Password if needed.
...
Origin commit data
------------------
Commit: 3776340268
Author: TangoCash <eric@loxat.de >
Date: 2016-10-28 (Fri, 28 Oct 2016)
2016-10-28 22:20:27 +02:00
vanhofen
2510d548e0
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
lib/timerdclient/timerdtypes.h
src/gui/channellist.cpp
src/system/httptool.h
Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 11:23:51 +02:00
TangoCash
0801b9f3bc
varius fixes
...
Origin commit data
------------------
Commit: fb26f93d98
Author: TangoCash <eric@loxat.de >
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
5aaea95ee1
add multiple remote boxes
...
Origin commit data
------------------
Commit: f354089763
Author: TangoCash <eric@loxat.de >
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +02:00
TangoCash
6b76a665f1
adding remote timer (experimental)
...
switch record timers to remote box or back with "play"-key
Origin commit data
------------------
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de >
Date: 2016-10-21 (Fri, 21 Oct 2016)
2016-10-21 10:47:37 +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
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
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
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
Jacek Jendrzej
1a5ff13a13
timerdclient.cpp add check if zapto or record timer double is
...
Origin commit data
------------------
Commit: 81eba0b35c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-02-03 (Tue, 03 Feb 2015)
2015-02-03 17:27:00 +01: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
fc1b332cc7
CTimerd:: enlarge recorddir and pluginname size
...
Origin commit data
------------------
Commit: 31221edc47
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-02-01 (Sat, 01 Feb 2014)
2014-02-01 13:59:06 +01:00
Michael Liebmann
1918153c0a
Preparing the menu classes for Lua Part #2
...
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-16 (Thu, 16 Jan 2014)
Origin message was:
------------------
Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
ad3e76b0ff
timerd: rename TIMER_NEXTPROGRAM
...
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
Origin commit data
------------------
Commit: 07caa88ad2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 21:03:11 +01:00
Stefan Seyfried
9dc8b9180a
timerdclient: remove EVT_NEXTPROGRAM
...
...and EVT_ANNOUNCE_NEXTPROGRAM.
These are only internal API, so no incompatibility should occur.
Origin commit data
------------------
Commit: 0d179f3f54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 21:02:49 +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
Michael Liebmann
a23a77f605
Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
...
Origin commit data
------------------
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-10-14 (Mon, 14 Oct 2013)
2013-10-17 04:22:49 +02: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
Jacek Jendrzej
55216499fa
fix gcc 4.7.x warnings
...
Origin commit data
------------------
Commit: df2ab71978
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 09:26:37 +02:00
Jacek Jendrzej
62163fa4e5
use empty() instead of size()
...
Origin commit data
------------------
Commit: 7d8d995046
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-06-18 (Mon, 18 Jun 2012)
Origin message was:
------------------
use empty() instead of size()
2012-06-18 16:57:44 +02: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] 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
9819856e7d
change 'long long' tom int64_t'; change variable buf to new delete;
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-02-07 (Sun, 07 Feb 2010)
2010-02-07 14:32:21 +00:00
Stefan Seyfried
4e814f593e
compiler warning fixes
...
Fix a bunch of "warning: type qualifiers ignored on function
return type" (you see them with -Wall -Wextra). Still lots to fix.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@103 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 7b87012631
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 00:00:02 +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