Commit Graph

14 Commits

Author SHA1 Message Date
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


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



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
FlatTV
ef7580097e add lib/jsoncpp v0.10.2
use amalgamated source and header based on version 0.10.2
 See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md


Origin commit data
------------------
Branch: ni/coolstream
Commit: 76e26c0b98
Author: FlatTV <FlatTV@gmx.de>
Date: 2015-06-01 (Mon, 01 Jun 2015)

Origin message was:
------------------
- add lib/jsoncpp v0.10.2

 use amalgamated source and header based on version 0.10.2
 See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md


------------------
This commit was generated by Migit
2015-06-01 12:36:15 +02:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
martii
1b16086415 lua: implement "luaclient".
This allows for starting Lua scripts in neutrino context from the
command line. Experimental, not fully regression-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d25185684
Author: martii <m4rtii@gmx.de>
Date: 2014-10-13 (Mon, 13 Oct 2014)



------------------
This commit was generated by Migit
2014-10-14 10:27:37 +02: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
[CST] Focus
8f3f8a7725 add libiw to build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f01a5740d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-01 16:43:06 +04: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
Stefan Seyfried
19000c33bd hw_caps: fix compile on coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ae305953c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-10 22:53:48 +01:00
Stefan Seyfried
e0bff04727 libneutrino-hal is now libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f5e4238cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:52 +02:00
Stefan Seyfried
79ebbf08b4 enable usage of a separately built replacement of libtriple
In order to improve portability, libtriple will be split off and
built separately as "libneutrino-hal" (for hardware abstraction layer)
Enable the makefiles to deal with that.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c8a561244e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-03 (Fri, 03 Feb 2012)



------------------
This commit was generated by Migit
2012-04-17 19:33:52 +02:00
Stefan Seyfried
f3b06d9a3f neutrino: add configure switch to disable upnp
Add a --disable-upnp switch to disable the UPNP browser for
those who want to use more modern external solutions.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bb7728e6d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)



------------------
This commit was generated by Migit
2011-11-05 17:10:42 +00:00
Stefan Seyfried
12d7ea5999 add "libtriple" skeleton
This should provide the same functionality as libcoolstream does,
but for the TripleDragon
Add td-compat directory with includes to convert values from
TD api to DVB api and back.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: c1039b69f9
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:09 +00:00
[CST] Focus
b4e06b4d0b Removed libcontrold dependency
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35d7d555b6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-14 (Sun, 14 Feb 2010)



------------------
This commit was generated by Migit
2010-02-14 13:09:07 +00:00
mrcolor
bcecfb6585 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
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00