Commit Graph

22 Commits

Author SHA1 Message Date
Stefan Seyfried
8253c4d67c 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
2013-05-10 10:06:47 +02:00
[CST] Focus
30d650999d lib/libcoolstream/video_cs.h: sync header 2013-03-08 17:33:28 +04:00
Stefan Seyfried
a5ed005ff8 neutrino: enable screenshots 2013-01-13 18:49:37 +01:00
[CST] Focus
94c7e6854c lib/libcoolstream: restore nevis headers 2013-01-11 14:00:49 +04:00
micha-bbg
b1138e16b0 * Fix include path for moved header files 2012-12-13 18:09:09 +01:00
[CST] Bas
b018c08cce neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time). 2012-12-04 00:28:34 +08:00
[CST] Bas
a222240dbb Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/timerd/timermanager.cpp
2012-09-26 17:52:47 +08:00
[CST] Bas
cf878686ba neutrino-apollo: changes for apollo uclibc. 2012-07-09 11:58:15 +08:00
focus
013ce5ce28 Enable screenshots; handle screenshot key in streaminfo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2091 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-02-15 13:34:07 +00:00
[CST] Focus
f9010a8bd1 update libcs headers 2012-01-13 16:15:21 +04:00
focus
4a3af851ef New library headers, change library name
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1573 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-07-21 10:58:02 +00:00
focus
b8c1fa5cc1 * reworked CA menu code
* added support for internal cardreaders for future conax support
* added inactivity shutdown timer for EuP
WARNING: new libcoolstream and libOpenThreads needed.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@925 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-07 10:00:52 +00:00
focus
41234dbfb5 Testing VBI, new libcoolstream needed
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@796 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-09-23 15:44:11 +00:00
satbaby
186f8fc5be comma at end of enumerator list
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@771 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-09-14 17:21:25 +00:00
focus
e1097960b0 auto video mode fix; enable key repeat for number and string choosers menu items
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@731 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-19 18:15:37 +00:00
focus
8c22be3153 use video auto modes only if they enabled in neutrino
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@728 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-19 12:47:18 +00:00
lucgas
84a70f99cc add new includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@619 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-06-11 09:32:30 +00:00
nightshad
b83214d7be Updated header with CEC changes.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@606 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-05-28 15:22:07 +00:00
nightshad
e75bd7e115 Add CEC modes of operation.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@601 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-05-28 08:06:27 +00:00
nightshad
6ad54303db Updated headers for new libcoolstream. Indent cleanups and
added functionality.
Add new CS API header. WIP.
Remove old init_cs.h header.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@596 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-05-20 09:41:59 +00:00
satbaby
3bcc6c5ce6 -fix comma at end of enumerator list
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@284 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-06 18:53:25 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-08 11:05:11 +00:00