Commit Graph

16 Commits

Author SHA1 Message Date
Stefan Seyfried
16256c1512 fix build for boxtype "generic"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0061aac2b3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-07 17:09:17 +02: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
Stefan Seyfried
21359893fc neutrino: first preliminary support for AZbox ME
this is very experimental and depends on more fixes in
libstb-hal, but audio / video / OSD are basically working


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2541edc918
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-06-18 (Mon, 18 Jun 2012)



------------------
This commit was generated by Migit
2012-06-27 21:18:19 +02:00
[CST] Focus
67f51ad268 remove obsolete and unused includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35ee04049a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)


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

------------------
This commit was generated by Migit
2012-06-14 11:01:37 +04:00
Stefan Seyfried
1690939b9f spark: build stubbed out lcddisplay code to fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: eabeec110c
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:53 +02:00
[CST] Focus
ec609f25f7 global.h: remove zapitclient.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: c78a8b364b
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 16:52:19 +04:00
[CST] Focus
730c6b7b13 Merge branch 'includecleanup' into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53ebe19696
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-08 (Thu, 08 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-08 11:18:52 +04:00
[CST] Focus
6ce5485ed0 rename EventList to CNeutrinoEventList - conflict with libdvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e3c19d448
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-07 21:03:47 +04:00
[CST] Bas
83efb61e6d src: fix compile after include change.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b33a52d86
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-04 15:54:01 +08:00
Stefan Seyfried
66b5bf4be1 neutrino: phase out last bits of controld code
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1825 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f9cbe76da
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 11:44:03 +00:00
Thilo Graf
b4818670e5 neutrino: trivial sort of includes and whitespace cleanups
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1503 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9609466f48
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-06-02 (Thu, 02 Jun 2011)

Origin message was:
------------------
*neutrino: trivial sort of includes and whitespace cleanups

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


------------------
This commit was generated by Migit
2011-06-02 20:44:45 +00:00
gixxpunk
18bd823362 add support for radiotext (needs testing) -> http://www.dbox2world.net/board293-coolstream-hd1/board296-coolstream-software/10635-radiotext-einbauen/
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1501 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec402d9518
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-06-02 (Thu, 02 Jun 2011)

Origin message was:
------------------
- add support for radiotext (needs testing) -> http://www.dbox2world.net/board293-coolstream-hd1/board296-coolstream-software/10635-radiotext-einbauen/

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


------------------
This commit was generated by Migit
2011-06-02 15:29:40 +00:00
gixxpunk
3ea784f312 add movieplayer.start & movieplayer.end script (untested)
- small cleanup

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: f06962d6c4
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-05-10 (Tue, 10 May 2011)

Origin message was:
------------------
- add movieplayer.start & movieplayer.end script (untested)
- small cleanup

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


------------------
This commit was generated by Migit
2011-05-10 15:27:56 +00:00
Stefan Seyfried
0d0f7c215c add lcd display code for Tripledragon, mostly from tuxbox
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@964 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66dd0b0174
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:43 +00:00
Thilo Graf
202af2f9d7 tuxbox-port: use new class modules,
this is one first part of ported parts from tuxbox,
comming soon there are comming more parts, but it's a lot to do,
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 632d7dd2e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2010-11-28 (Sun, 28 Nov 2010)



------------------
This commit was generated by Migit
2010-11-27 23:17:30 +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