Commit Graph

309 Commits

Author SHA1 Message Date
vanhofen
4befb00cfa yweb: add key 'sleep'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee4a4cbea1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-14 (Tue, 14 May 2013)

Origin message was:
------------------
- yweb: add key 'sleep'

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

------------------
This commit was generated by Migit
2013-05-14 22:40:49 +02:00
Stefan Seyfried
c7ae873506 nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db15cc630
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 10:02:33 +04:00
[CST] Focus
cf1edc9e64 remove 'coolstream' from gui
Origin commit data
------------------
Branch: ni/coolstream
Commit: cdf10ef46e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-22 (Fri, 22 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-22 10:52:39 +04:00
[CST] Focus
b2ea79a8aa nhttpd/tuxboxapi/coolstream/controlapi.cpp: create screenshot in sync mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 370e3dd690
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-19 17:24:09 +04:00
[CST] Focus
d0ccb2c97d Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
Stefan Seyfried
0e01a7b32c neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00
[CST] Focus
e1b0837ce1 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-13 15:34:41 +04:00
vanhofen
fb7b462bbd controlapi.cpp: make ScreenshotCGI() more configurable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 133740da14
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
- controlapi.cpp: make ScreenshotCGI() more configurable

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

------------------
This commit was generated by Migit
2013-02-12 13:58:21 +01:00
[CST] Focus
9e79b81b06 nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: filter channels, show real channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 720bfba267
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 13:05:08 +04:00
[CST] Bas
1e3dcd7e9a neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dfa226920
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-25 (Fri, 25 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-25 10:33:40 +08:00
[CST] Focus
46f1deca39 Makefiles.am: add conditional include for libcoolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3d2efe475
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-11 14:17:16 +04:00
[CST] Focus
0afd2ce386 merge public git changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-09 19:30:07 +04:00
Gaucho316
a10ee73e99 nhttpd: don't decode URL parameters multiple times
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b4ad51d0a
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2012-12-29 (Sat, 29 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-31 07:04:52 +01:00
Jacek Jendrzej
c6136d612f src/nhttpd/tuxboxapi/coolstream/controlapi.cpp: add current transponder pchannels list , use: <BOXID>/control/currenttpchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4965619a79
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-23 (Sun, 23 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-23 19:12:41 +01:00
Jacek Jendrzej
e8187af7b2 nhttpd: fix encode bouquet and audio name
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d1beb8402
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-20 (Thu, 20 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-20 21:05:44 +01:00
Jacek Jendrzej
e32201a8b2 nhttpd: dont doubles decode, revert 5ca6120a2f
Origin commit data
------------------
Branch: ni/coolstream
Commit: f66b2baedc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-17 (Mon, 17 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-17 22:01:46 +01:00
Jacek Jendrzej
26df68f01a supplement to b184f39eb5
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3ddc46e14
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-08 17:53:01 +01:00
Jacek Jendrzej
b184f39eb5 yWeb: Timer: dont stop recording after modifying timer - Timer: sets audio-pid correctly - Timer: seconds set to Null
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc33e93375
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-08 17:47:25 +01:00
[CST] Bas
fe727eb954 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



------------------
This commit was generated by Migit
2012-12-07 14:39:05 +08: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
vanhofen
49e7d1904d yweb: fix remotecontrol; remove dependency from MAC
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8131a25af1
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-19 (Mon, 19 Nov 2012)

Origin message was:
------------------
- yweb: fix remotecontrol; remove dependency from MAC

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

------------------
This commit was generated by Migit
2012-11-19 22:33:50 +01:00
[CST] Bas
849d5ca191 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)



------------------
This commit was generated by Migit
2012-11-13 12:51:18 +08:00
[CST] Bas
5c5a90ff05 neutrino: fix config file locations.
Origin commit data
------------------
Branch: ni/coolstream
Commit: e426104399
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-13 12:45:17 +08:00
Jacek Jendrzej
6d7ffeadd1 controlapi.cpp:revert to standard output
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf1dfdad7c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-22 21:28:38 +02:00
Jacek Jendrzej
bb097d5d95 rc_lock: lock for rc_lock, use only once, supplement to b0b4b885ed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a2d6aea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)

Origin message was:
------------------
rc_lock: lock for rc_lock, use only once, supplement to b0b4b885ed

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

------------------
This commit was generated by Migit
2012-10-22 15:52:07 +02:00
Jacek Jendrzej
b0b4b885ed nhttpd::controlapi.cpp:execute more comands on/off only once (fix doubleclick)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e3567dc09
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-22 14:00:01 +02:00
[CST] Focus
96148052c5 remove channel_id mask for CEitManager getXXX calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f5a0e5bb1
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 14:50:01 +04: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
Jacek Jendrzej
37a826a5a2 use empty() instead of size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1a1aae4c1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()

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

------------------
This commit was generated by Migit
2012-06-16 10:38:38 +02:00
Jacek Jendrzej
5ed8825b21 use empty() instead of size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()

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

------------------
This commit was generated by Migit
2012-06-16 09:44:42 +02:00
Jacek Jendrzej
d6ac9e52c5 never used values
Origin commit data
------------------
Branch: ni/coolstream
Commit: e023548008
Author: Jacek Jendrzej <overx300@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 15:49:36 +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
Jacek Jendrzej
7ec8226ad2 performance Prefer prefix ++/-- operators for non-primitive types.
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-28 10:56:27 +02:00
Michael Liebmann
0ce6e40d80 Add missing $(top_builddir) to Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: f36ee26d87
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)

Origin message was:
------------------
* Add missing $(top_builddir) to Makefile.am

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

------------------
This commit was generated by Migit
2012-04-27 16:54:01 +01:00
[CST] Focus
fd377d80c4 nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: replace Zapit->isChannelTVChannel() with CServiceManager IsChannelTVChannel()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dac9d3318
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-18 (Wed, 18 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-18 19:02:32 +04:00
[CST] Focus
34c179c4c6 nhttpd/tuxboxapi/coolstream/controlapi.cpp: replace Zapit->isChannelTVChannel() with CServiceManager IsChannelTVChannel()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 886ebdb146
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-18 (Wed, 18 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-18 19:02:06 +04:00
[CST] Bas
8d66fc7d9f Merge branch 'dvbsi++' of 109.75.98.228:cst-private-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: cac6486202
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-13 (Fri, 13 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-13 16:24:56 +08:00
[CST] Bas
6abfd0c1f2 Merge branch 'master' into dvbsi++
Conflicts:
	src/zapit/include/zapit/zapit.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86dbdde70d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-12 (Thu, 12 Apr 2012)



------------------
This commit was generated by Migit
2012-04-13 04:55:55 +08:00
[CST] Focus
6b14e079e0 rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID
Origin commit data
------------------
Branch: ni/coolstream
Commit: b072232956
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-10 14:35:09 +04:00
gixxpunk
0e4170c27d yweb: add new keys (patch by FlatTV)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2202 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0db5dc72a9
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-04-09 (Mon, 09 Apr 2012)

Origin message was:
------------------
- yweb: add new keys (patch by FlatTV)

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


------------------
This commit was generated by Migit
2012-04-09 09:55:42 +00:00
Michael Liebmann
f502370104 Creating a screenshot added to yWeb
- Create Screenshot: http://box/control/screenshot
 (patch by FlatTv)

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 45a2a6eab8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-08 (Sun, 08 Apr 2012)

Origin message was:
------------------
* Creating a screenshot added to yWeb

- Create Screenshot: http://box/control/screenshot
 (patch by FlatTv)

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


------------------
This commit was generated by Migit
2012-04-08 12:26:08 +00:00
Jacek Jendrzej
863b2bb179 nhttpd:-fix standby info
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2172 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: d702881157
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-02 (Mon, 02 Apr 2012)



------------------
This commit was generated by Migit
2012-04-02 20:38:34 +00:00
[CST] Bas
2e21cb2d44 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2142970a35
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-06 12:51:31 +08:00
[CST] Bas
5451b4c30e nhttpd: fix compile after include change.
Origin commit data
------------------
Branch: ni/coolstream
Commit: cfea9b493f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-04 15:51:56 +08: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
02482c4233 ./nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp: remove CSectionsdClient, use direct call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81159fb655
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-16 (Thu, 16 Feb 2012)


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

------------------
This commit was generated by Migit
2012-02-16 19:56:05 +04:00
[CST] Focus
a7c99e3ce1 nhttpd/tuxboxapi/coolstream/controlapi.cpp: remove CSectionsdClient, use direct call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5bc344fb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-16 (Thu, 16 Feb 2012)


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

------------------
This commit was generated by Migit
2012-02-16 19:53:26 +04:00
[CST] Focus
3a9440cb5f sync
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dfaa13725
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-10 (Fri, 10 Feb 2012)


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

------------------
This commit was generated by Migit
2012-02-10 19:11:39 +04:00
Jacek Jendrzej
33e17696a3 typo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2085 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7df5f6394b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-02-10 (Fri, 10 Feb 2012)



------------------
This commit was generated by Migit
2012-02-10 14:58:21 +00:00