Commit Graph

205 Commits

Author SHA1 Message Date
[CST] Focus
8bb70d1ab3 Merge branch 'pu/cc' into next-cc
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h
2013-04-17 13:32:12 +04:00
Stefan Seyfried
5ad0b6b6dc Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp
2013-04-06 11:21:55 +02:00
Thilo Graf
98b3265719 Data files: add license files
Avoids hard coded parts e.g. for use mainly in image info.
2013-03-18 12:05:01 +01:00
Stefan Seyfried
d2d8218885 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
2013-03-06 17:23:46 +01:00
[CST] Focus
57cdcd8379 configure.ac: add enable-pip option 2013-03-05 18:33:52 +04:00
[CST] Focus
026592e8fe Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2013-02-28 16:39:34 +04:00
Stefan Seyfried
5b72a7fe3c make the extupdate build conditional
extupdate is not very useful for most platforms, so only
build it if --enable-extupdate is passed to configure
2013-02-22 17:14:38 +01:00
Thilo Graf
0a961a4cf6 CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.
2013-02-19 11:27:46 +01:00
Thilo Graf
f3f347bdb3 CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.
2013-02-16 12:13:24 +01:00
[CST] Focus
6724414335 configure.ac: always define HAVE_COOLSTREAM_NEVIS_IR_H, ifdef in rcinput.h decide what to include 2013-01-30 11:16:24 +04:00
[CST] Bas
ee169288a5 neutrino: add multiple paths so they can be configured and not be hard-coded in
multiple files.
2013-01-29 01:18:38 +08:00
[CST] Focus
18380c2e94 configure.ac: change tests for apollo headers 2013-01-11 14:00:25 +04:00
Stefan Seyfried
acfd623d02 fix nevis_ir.h check and libcoolstream/hwcaps 2012-12-30 21:36:44 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
2012-12-30 21:35:20 +01:00
micha-bbg
b1138e16b0 * Fix include path for moved header files 2012-12-13 18:09:09 +01:00
[CST] Bas
cdcd42ea8a neutrino: use pkgconfig for OGG. 2012-12-04 00:24:46 +08:00
[CST] Bas
a806919b8c neutrino: add data to the make file so they get installed properly. 2012-11-13 12:46:20 +08:00
Stefan Seyfried
1ae305953c hw_caps: fix compile on coolstream 2012-11-10 22:53:48 +01:00
S.R. van Loon
83636ebb6e neutrino: change all remote/frontpanel stuff to use the new headers. 2012-09-25 22:23:17 +08:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
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
2012-07-23 01:02:29 +02:00
[CST] Focus
1684a850f1 configure.ac: add --enable-cleanup which add EXIT_CLEANUP define, to ifdef code for testing with valgrind 2012-05-02 17:48:55 +04:00
Stefan Seyfried
6f5e4238cc libneutrino-hal is now libstb-hal 2012-04-17 19:33:52 +02:00
Stefan Seyfried
27315a43cc add USE_NEUTRINO_HAL define for libneutrino-hal 2012-04-17 19:33:52 +02:00
Stefan Seyfried
c8a561244e 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.
2012-04-17 19:33:52 +02:00
[CST] Focus
fd3f7b92a1 Merge branch 'master' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-04-13 17:10:00 +04:00
[CST] Focus
f0ea5c75c7 configure.ac: add missed r2189 from striper (allow usage of giflib instead of libungif) 2012-04-13 16:48:53 +04:00
[CST] Bas
2142970a35 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup 2012-03-06 12:51:31 +08:00
[CST] Bas
b181c7faaf configure.ac: do not generate standard include paths as we want finer
control.
2012-03-04 14:21:31 +08:00
[CST] Focus
3ea0c375ea Copy sectionsd code to new eitd directory, to cleanup and leave original code for reference 2012-02-01 16:09:49 +04:00
seife
1bb7728e6d 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
2011-11-05 17:10:42 +00:00
seife
7f9cbe76da 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
2011-11-05 11:44:03 +00:00
seife
ba596cbc4d make the --with-tremor-static hack less disgusting
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1554 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-19 21:01:53 +00:00
seife
b55ee717d1 drivertool: add shortcuts to switch TD and CS remote
* add shortcut options for TD and CS remotes
* use nevis_ir.h if present
Needs testing frontpanel driver to work properly.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1547 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-19 11:00:05 +00:00
seife
bfb705ef5c add libFLAC for use with audioplayer (enable with --enable-flac)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1540 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-13 15:25:42 +00:00
striper
b7876b227e - fix typo from rev. 1523
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1528 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-08 16:38:01 +00:00
seife
a2b2b7b069 add --enable-freesatepg configure switch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1523 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-05 18:44:25 +00:00
seife
6efb0d5e47 get rid of HAVE_DVB_API_VERSION define
remove non-working legacy code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1289 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-12 12:36:13 +00:00
seife
4b74f1f5b8 allow for 'id3tag.pc' and 'mad.pc' as used by linux distributions
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1288 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-12 11:30:45 +00:00
seife
27287bdea3 neutrino: allow to link static tremor lib
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1227 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-27 13:37:46 +00:00
seife
cf42baf9e3 neutrino: enable silent build rules
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1177 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-20 17:37:43 +00:00
focus
37a6e0e120 Please stop the flame, and keep defines the way they used to compile official images
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1124 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-08 14:20:41 +00:00
seife
a55a7e6eb8 hide mount hack behind a configure switch
the mount hack has nothing to do with coolstream hardware, but with
broken userspace, thus hide it behind a configure switch

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1123 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-08 12:52:20 +00:00
seife
0f1f445921 neutrino: add --with-tremor configure option to use libvorbisidec
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1113 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-05 14:54:24 +00:00
seife
66dd0b0174 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
2010-12-25 17:43:43 +00:00
seife
a6b89367bf libtriple: implement init_td_api and shutdown_td_api
provide compatibility with cs_api_init() and cs_api_exit()
This contains a DirectFB wrapper, needed to make the framebuffer
transparent. The framebuffer itself is usable without DFB.
Additionally it sets up the system for a changed RC address in "BIOS".

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@961 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-25 17:43:14 +00:00
seife
c1039b69f9 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
2010-12-25 17:43:09 +00:00
thilo
182b827b28 tuxbox-port: added theme files, will be installed as own files instead hardcoded in neutrino.cpp
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@898 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-11-27 23:17:01 +00:00
striper
4a4dbb7084 - add missing stuff for script installation
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@836 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-10-12 18:11:57 +00:00
seife
982b28298a Merge branch 'tmp'
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@763 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-09-12 16:13:53 +00:00
striper
d75cab64ea - install radio-stations.xml
- todo fix .../scripts/Makefile.am (how to set 755?)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@649 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-07-04 10:02:00 +00:00