Commit Graph

158 Commits

Author SHA1 Message Date
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
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
martii
d1ed51a228 nhttpd/controlapi: add mode=all to GetBouquetCGI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b730409ed
Author: martii <m4rtii@gmx.de>
Date: 2013-12-26 (Thu, 26 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +01:00
martii
6fa7c4f1d6 nhttpd/controlapi: GetBouquetsCGI: support "mode=all" (compiles, untested)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83534791ef
Author: martii <m4rtii@gmx.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +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
Jacek Jendrzej
8444bc6d2b CControlAPI::GetBouquetsCGI: -add TV/RADDIO mode selectable (THX martii)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0866bc65a7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-25 18:11:33 +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
6a04931cb7 Makefiles: simplify includes for libcoolstream/libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-11 21:51:08 +01:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +01:00
Jacek Jendrzej
ced560668b CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG
Origin commit data
------------------
Branch: ni/coolstream
Commit: aaad29a245
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-05 15:42:50 +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
Jacek Jendrzej
6323734197 CControlAPI::GetBouquetCGI fix segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 733f7a5382
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-12 22:01:17 +02:00
Jacek Jendrzej
345419d01f CControlAPI::EpgCGI fix control/epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 03b7151563
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-12 21:39:41 +02:00
[CST] Focus
3137c4497c neutrino: add EAC3 audio support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e6276def7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-08 17:18:35 +04:00
vanhofen
40101950e4 controlapi: use rcsim.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c2fbf3348
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-04 (Fri, 04 Oct 2013)

Origin message was:
------------------
- controlapi: use rcsim.h

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

------------------
This commit was generated by Migit
2013-10-04 12:00:28 +02:00
Jacek Jendrzej
68696c85af CControlAPI::SendChannelList: show only unique channellist & currenttpchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d7751dc8c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-01 17:55:18 +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
afca303c15 nhttpd/tuxboxapi/coolstream/controlapi.cpp: wakeup zapit before neutrino,
to be sure zapit will process any next commands


Origin commit data
------------------
Branch: ni/coolstream
Commit: d26bc23f6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)



------------------
This commit was generated by Migit
2013-09-27 16:27:21 +04: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
Jacek Jendrzej
226972c34c CControlAPI::_GetBouquetWriteItem: -fix UTF-8 (THX Gaucho316) http://www.dbox2world.net/index.php?page=Thread&postID=157423
Origin commit data
------------------
Branch: ni/coolstream
Commit: c06e0c4bb4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-24 12:39:54 +02:00
vanhofen
b5aa6b36b8 yweb: remove delivery_system from boxtype tank
and avoid duplicate code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99b477207f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-20 (Fri, 20 Sep 2013)

Origin message was:
------------------
- yweb: remove delivery_system from boxtype tank

 and avoid duplicate code


------------------
This commit was generated by Migit
2013-09-20 13:36:42 +02:00
[CST] Focus
4b08171904 nhttpd/tuxboxapi/coolstream/controlapi.cpp: call GetChannelEvents only if epg param present,
add 'fav' param to get only user bouquets;
add support to get bouquet's channel list with epg also in plain format


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2df40249d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)



------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04: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
vanhofen
81bb786c2f controlapi/yparser: detect new models tank and trinity
Origin commit data
------------------
Branch: ni/coolstream
Commit: efe212413b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-15 (Thu, 15 Aug 2013)

Origin message was:
------------------
- controlapi/yparser: detect new models tank and trinity

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

------------------
This commit was generated by Migit
2013-08-15 16:25:38 +02:00
vanhofen
c7d0ae03e4 yweb: add PCR PID handling to live streaming ...
... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff161a699c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-09 (Fri, 09 Aug 2013)

Origin message was:
------------------
- yweb: add PCR PID handling to live streaming ...

... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git


------------------
This commit was generated by Migit
2013-08-09 11:04:26 +02:00
Stefan Seyfried
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
vanhofen
bbebbb9ac3 yweb: rework classifying slidertable in channellist for a smoother view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63173fd5e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-28 (Fri, 28 Jun 2013)

Origin message was:
------------------
- yweb: rework classifying slidertable in channellist for a smoother view

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

------------------
This commit was generated by Migit
2013-06-28 00:52:59 +02: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
vanhofen
b0f5491fb9 yweb: use more matching zee-remotecontrol for neo twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa0920d807
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)

Origin message was:
------------------
- yweb: use more matching zee-remotecontrol for neo twin

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

------------------
This commit was generated by Migit
2013-06-13 11:43:40 +02: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
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
9fc6c24a21 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead


Origin commit data
------------------
Branch: ni/coolstream
Commit: d2d8218885
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-06 (Wed, 06 Mar 2013)



------------------
This commit was generated by Migit
2013-03-06 17:23:46 +01: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
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
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
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
[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