Commit Graph

32 Commits

Author SHA1 Message Date
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
Michael Liebmann
4abf2a80f8 yWeb: Synchronize volume/audiomute settings yWeb => GUI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fce346c0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-12 06:02:27 +01:00
Stefan Seyfried
d235d78f43 Merge remote-tracking branch 'broken/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65437a60a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-28 (Tue, 28 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-28 13:22:00 +01:00
Jacek Jendrzej
8126ba13a5 webif standby -add option CEC standby off (dont use TV off)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9855a220be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-28 10:30:29 +01:00
Stefan Seyfried
fe96831ba6 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9bc524562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-27 (Mon, 27 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-27 21:00:18 +01:00
Jacek Jendrzej
e9643a6d05 add webif option dont use CEC with standbyoff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4be0273083
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)

Origin message was:
------------------
-add webif option dont use CEC with standbyoff

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

------------------
This commit was generated by Migit
2014-01-26 22:24:17 +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
2c48d93e05 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-07 18:28:56 +01:00
vanhofen
669c1fc9bf yWeb: use same order in search for channellogos as neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8f7668a9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-06 (Fri, 06 Dec 2013)

Origin message was:
------------------
- yWeb: use same order in search for channellogos as neutrino

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

------------------
This commit was generated by Migit
2013-12-06 13:30:52 +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
vanhofen
dc660e7e7f yweb: fix /control/reboot
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5227f726c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)

Origin message was:
------------------
- yweb: fix /control/reboot

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

------------------
This commit was generated by Migit
2013-09-28 22:25:41 +02:00
[CST] Focus
aa8cce313d nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp: fix memleak in GetChannelEvents()
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2d5ccdce2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-25 17:08:34 +04:00
Stefan Seyfried
46398344c7 don't use sizeof(pointer), it is not useful :-)
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7dfc9757a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-28 (Tue, 28 May 2013)


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

------------------
This commit was generated by Migit
2013-05-28 14:27:51 +02:00
Jacek Jendrzej
c65016492b src/nhttpd: clean code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e4a541781
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-28 19:03:03 +01:00
[CST] Focus
5580b9cc18 use CEitManager to get EIT data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-30 11:40:02 +04:00
Jacek Jendrzej
1fc94b37ae fix gcc 4.7.x warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-07 13:09:08 +02:00
[CST] Focus
558497f4ae comment some found not used variables
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e06495776
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)


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

------------------
This commit was generated by Migit
2012-05-08 16:18:16 +04:00
[CST] Focus
bceeb8bb27 neutrino.cpp: register CZapitClient::EVT_TUNE_COMPLETE;
send full channel id with Sectionsd->setServiceChanged - mask will be done in sectionsd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1af6f79d2c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)



------------------
This commit was generated by Migit
2012-02-19 14:17:46 +04:00
[CST] Focus
eb6b0fc3e5 nhttpd neutrinoapi: use channel camap in place of global pmt_caids
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffd335adaa
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)


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

------------------
This commit was generated by Migit
2012-01-13 15:12:01 +04:00
[CST] Focus
1e0b87cbe3 Remove global allchans, use CServiceManager.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1649 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 28382c9aa5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-09-01 (Thu, 01 Sep 2011)



------------------
This commit was generated by Migit
2011-09-01 12:24:18 +00:00
gixxpunk
f97dd6417e yWeb - support for png-logos
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1418 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7b08b66bc
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-05-01 (Sun, 01 May 2011)

Origin message was:
------------------
- yWeb - support for png-logos

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1418 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-05-01 18:31:43 +00:00
Stefan Seyfried
1ca74c99b4 add generic dispatcher headers for frontend etc
add generic audio, video and demux headers in zapit/include (TODO: put them
into a better place, or put wrappers into lib directories) that automatically
dispatch to the hardware specific functions and use them in the code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@962 e54a6e83-5905-42d5-8d5c-058d10e6a962


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



------------------
This commit was generated by Migit
2010-12-25 17:43:28 +00:00
Jacek Jendrzej
4bc3849e21 add reloadsetup (neutrino.conf) to nhttpd controlapi
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@849 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3bf282f8d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-10-21 (Thu, 21 Oct 2010)

Origin message was:
------------------
-add reloadsetup (neutrino.conf) to nhttpd controlapi

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@849 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2010-10-21 06:27:59 +00:00
yjogol
04001b1c5a nhttpd: channel logo names: space allowed
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@560 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e638dbc083
Author: yjogol <yjogol2@online.de>
Date: 2010-05-02 (Sun, 02 May 2010)



------------------
This commit was generated by Migit
2010-05-02 12:56:58 +00:00
yjogol
b7112c7a06 yweb 2.8.0.3 new logo handling and some fixes to EPG Plus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@530 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9823c3a34a
Author: yjogol <yjogol2@online.de>
Date: 2010-03-27 (Sat, 27 Mar 2010)



------------------
This commit was generated by Migit
2010-03-27 18:00:24 +00:00
yjogol
1df251dfbd yweb: new version number 2.8.b.4, nhttpd 3.2.4
- add /control/crypt for crypto information
- add crypto information to streaminfo

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@482 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7187da658
Author: yjogol <yjogol2@online.de>
Date: 2010-03-13 (Sat, 13 Mar 2010)



------------------
This commit was generated by Migit
2010-03-13 10:10:47 +00:00
yjogol
3260844a24 nhttpd:
- controlapi: add audio to API (/control/audio)
- neutrinoapi: add some new function for streaming infos

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@479 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c49e36d50
Author: yjogol <yjogol2@online.de>
Date: 2010-03-13 (Sat, 13 Mar 2010)



------------------
This commit was generated by Migit
2010-03-13 09:12:31 +00:00
yjogol
8813b6b794 nhttpd:controlapi: activate videoformat to API again
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@478 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: f779a33337
Author: yjogol <yjogol2@online.de>
Date: 2010-03-13 (Sat, 13 Mar 2010)



------------------
This commit was generated by Migit
2010-03-13 08:10:06 +00:00
yjogol
168d78506e nhttpd:controlapi: add aspectratio to API again
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@477 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8e50a84f2
Author: yjogol <yjogol2@online.de>
Date: 2010-03-13 (Sat, 13 Mar 2010)



------------------
This commit was generated by Migit
2010-03-13 07:44:07 +00:00
yjogol
80b202600e yweb: show channelname in timerlis correctly (ybug 450)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@422 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ff9ca6f59
Author: yjogol <yjogol2@online.de>
Date: 2010-02-26 (Fri, 26 Feb 2010)



------------------
This commit was generated by Migit
2010-02-26 07:09:32 +00:00
yjogol
8798399cf2 yWeb 2.8.a.3 Alpha-Version
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@407 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 28b5d1b84f
Author: yjogol <yjogol2@online.de>
Date: 2010-02-24 (Wed, 24 Feb 2010)



------------------
This commit was generated by Migit
2010-02-24 16:16:44 +00:00