Commit Graph

89 Commits

Author SHA1 Message Date
Stefan Seyfried
07ccb9a351 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02:00
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
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
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
Stefan Seyfried
0b706c2b8d nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Branch: ni/coolstream
Commit: 069bf46578
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-06 11:49:47 +02: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
Stefan Seyfried
921a382447 neutrino: fix most hardcoded paths
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-10 02:01:52 +01:00
Stefan Seyfried
77c08c4c15 Merge branch 'check/dvbsi++' commit c16f636011
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)



------------------
This commit was generated by Migit
2013-02-21 17:07: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] 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
Stefan Seyfried
b32ccc925c neutrino: enable screenshots
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-13 18:49:37 +01:00
Stefan Seyfried
e4acb04e3b Merge branch 'uncool/dvbsi++' commit 9ec9ae527b
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)



------------------
This commit was generated by Migit
2013-01-03 09:46:11 +01: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
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


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



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +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
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
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
Stefan Seyfried
4edeb50241 Merge branch 'uncool/dvbsi++'
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


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



------------------
This commit was generated by Migit
2012-11-23 18:45:22 +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
Stefan Seyfried
a7d632a19a 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: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 14:05:48 +01:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


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



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01: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
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.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/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +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
Stefan Seyfried
3df9a6f7f5 Merge branch 'uncool/dvbsi++' commit '9d968280bac'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
2012-07-23 01:02:29 +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
[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
Stefan Seyfried
8d37b53646 nhttpd/controlapi: don't build incompatibly licensed code
Origin commit data
------------------
Branch: ni/coolstream
Commit: dce95336a3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-14 (Sat, 14 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:59 +02: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] 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
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
Jacek Jendrzej
4d73b4355d controlapi: -add relodplugins
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2084 e54a6e83-5905-42d5-8d5c-058d10e6a962


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



------------------
This commit was generated by Migit
2012-02-10 13:33:25 +00:00
Jacek Jendrzej
8d199c229e safter strncat & enlarged audio descriptor name length
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2005 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bed601438e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-12-26 (Mon, 26 Dec 2011)



------------------
This commit was generated by Migit
2011-12-26 11:03:40 +00:00
Thilo Graf
74542c4161 neutrino: add timeout parameter for message via web api
based up patch by FlatTV
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/10855-nachrichten-%C3%BCber-das-yweb-mit-variablem-timeout-senden/

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8e76315ce
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-10-28 (Fri, 28 Oct 2011)

Origin message was:
------------------
*neutrino: add timeout parameter for message via web api

based up patch by FlatTV
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/10855-nachrichten-%C3%BCber-das-yweb-mit-variablem-timeout-senden/

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


------------------
This commit was generated by Migit
2011-10-28 21:57:23 +00:00