mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,940 Commits 2 Branches 9 Tags
b011ff37b9cd2f7cf30103d5a6b51c4e6e96b927
Commit Graph

22 Commits

Author SHA1 Message Date
Stefan Seyfried
f6c0718366 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
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
[CST] Focus
6aab5eae1b lib/libcoolstream/video_cs.h: sync header 
Origin commit data
------------------
Commit: 30d650999d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
 2013-03-08 17:33:28 +04:00
Stefan Seyfried
f2e855b7ef neutrino: enable screenshots 
Origin commit data
------------------
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 18:49:37 +01:00
[CST] Focus
146f595ba1 lib/libcoolstream: restore nevis headers 
Origin commit data
------------------
Commit: 94c7e6854c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 14:00:49 +04:00
Michael Liebmann
7332aea363 Fix include path for moved header files 
Origin commit data
------------------
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files
 2012-12-13 18:09:09 +01:00
[CST] Bas
2da2954b72 neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time). 
Origin commit data
------------------
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
 2012-12-04 00:28:34 +08:00
[CST] Bas
8965dc519f Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
 2012-09-26 17:52:47 +08:00
[CST] Bas
2ced7346c2 neutrino-apollo: changes for apollo uclibc. 
Origin commit data
------------------
Commit: cf878686ba
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
 2012-07-09 11:58:15 +08:00
[CST] Focus
a46b44fba4 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


Origin commit data
------------------
Commit: 013ce5ce28
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-15 (Wed, 15 Feb 2012)
 2012-02-15 13:34:07 +00:00
[CST] Focus
4372713b84 update libcs headers 
Origin commit data
------------------
Commit: f9010a8bd1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
 2012-01-13 16:15:21 +04:00
[CST] Focus
71a5313b2e 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


Origin commit data
------------------
Commit: 4a3af851ef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
 2011-07-21 10:58:02 +00:00
[CST] Focus
d1a99570ee 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


Origin commit data
------------------
Commit: b8c1fa5cc1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-12-07 (Tue, 07 Dec 2010)

Origin message was:
------------------
* 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
[CST] Focus
ec2b5e0d17 Testing VBI, new libcoolstream needed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@796 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 41234dbfb5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-09-23 (Thu, 23 Sep 2010)
 2010-09-23 15:44:11 +00:00
Jacek Jendrzej
37a61f0ac6 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


Origin commit data
------------------
Commit: 186f8fc5be
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-09-14 (Tue, 14 Sep 2010)
 2010-09-14 17:21:25 +00:00
[CST] Focus
0a59039863 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


Origin commit data
------------------
Commit: e1097960b0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-08-19 (Thu, 19 Aug 2010)
 2010-08-19 18:15:37 +00:00
[CST] Focus
b1116120fe 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


Origin commit data
------------------
Commit: 8c22be3153
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-08-19 (Thu, 19 Aug 2010)
 2010-08-19 12:47:18 +00:00
[CST] Lucian
d44aa30699 add new includes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@619 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 84a70f99cc
Author: [CST] Lucian <lucian@coolstreamtech.com>
Date: 2010-06-11 (Fri, 11 Jun 2010)
 2010-06-11 09:32:30 +00:00
nightshad
a1a23e3ee0 Updated header with CEC changes. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@606 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: b83214d7be
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2010-05-28 (Fri, 28 May 2010)
 2010-05-28 15:22:07 +00:00
nightshad
c19460113f Add CEC modes of operation. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@601 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e75bd7e115
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2010-05-28 (Fri, 28 May 2010)
 2010-05-28 08:06:27 +00:00
nightshad
6f6f4484cb 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


Origin commit data
------------------
Commit: 6ad54303db
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2010-05-20 (Thu, 20 May 2010)
 2010-05-20 09:41:59 +00:00
Jacek Jendrzej
622f968741 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


Origin commit data
------------------
Commit: 3bcc6c5ce6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-06 (Sat, 06 Feb 2010)

Origin message was:
------------------
-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
cb8dd3394d 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
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
 2009-12-08 11:05:11 +00:00