mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,117 Commits 1 Branch 51 Tags
d1eebea38173f2649a84b8c23ddeb44a2370b41b
Commit Graph

63 Commits

Author SHA1 Message Date
Stefan Seyfried
7d379dcb30 Merge remote-tracking branch 'check/next-cc' 2013-12-29 22:12:09 +01:00
[CST] Focus
13fb2bc67a playback_cs.h: add MAX_PLAYBACK_PIDS define 2013-12-26 15:23:52 +04:00
Stefan Seyfried
831fff71f3 update lcddisplay and libcoolstream to AM_CPPFLAGS 2013-11-03 02:07:51 +01:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2013-10-21 22:58:55 +02:00
[CST] Focus
c2a11f6dd2 lib/libcoolstream/playback_cs.h: update apollo header 2013-09-03 18:38:01 +04:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
 2013-06-02 10:46:42 +04:00
[CST] Focus
83c7de004e lib/libcoolstream/playback_cs.h: new header 2013-05-30 10:24:46 +04:00
Jacek Jendrzej
a549b97924 fix comma at end of enumerator list 2013-05-28 15:52:31 +02:00
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
138160ae4f libcoolstream/ca_cs.h: sync header 2013-03-08 17:56:03 +04: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
d3e2a2bdd0 add libcoolstream/cs_frontpanel.h copy 2013-01-11 15:14:12 +04:00
[CST] Focus
f92d9e6e57 lib/libcoolstream: sync headers 2013-01-11 11:10:58 +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
svenhoefer
da716f865e Merge remote-tracking branch 'svn_CROSSENVIRONMENT_coolstream/master' into dvbsi++ 2012-12-13 10:50:49 +01:00
svenhoefer
998ae6d81d - svn_CROSSENVIRONMENT_coolstream: move files to new right place 2012-12-13 10:49:06 +01:00
Stefan Seyfried
1ae305953c hw_caps: fix compile on coolstream 2012-11-10 22:53:48 +01:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.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/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2012-10-14 12:51:07 +02:00
[CST] Focus
70836baa48 lib/libcoolstream/record_cs.h: update header 2012-09-25 17:13:43 +04:00
Stefan Seyfried
04ee2e87f3 neutrino: start to use hardware_caps 
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
 2012-09-23 21:34:47 +02:00
[CST] Focus
f8aa4262cb recording: testing support for multi-record of the same channel, new libs required 2012-08-03 20:00:04 +04:00
satbaby
e14fc80ed5 -pedantic fixes 2012-05-08 18:59:11 +02:00
[CST] Focus
20aaec4e1c lib/libcoolstream/ca_cs.h: sync header 2012-04-26 21:44:21 +04:00
[CST] Focus
9f3e2dc9c5 Merge branch 'master' into multituner 2012-03-29 12:23:22 +04:00
focus
6be9b772ae libcs headers update 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2167 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-28 16:16:09 +00:00
[CST] Focus
2ecc60cf71 Merge branch 'master' into multituner 2012-03-02 18:59:50 +04:00
focus
84afbc9a66 audio: change change DD over hdmi options to: 
off, auto (old ON, if supported by device) and force

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2135 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-02 14:39:51 +00: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
a44467fe14 Update header 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1981 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-20 13:24:34 +00: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
nightshad
baf585e16c Added comments about different blending modes as requested 
on mailinglist.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1367 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-31 15:18:49 +00:00
nightshad
0ad1fd41fd Our new FB driver header. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1361 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-31 10:49:31 +00:00
focus
cdae0a8bd3 Testing foreign ts+xml recording playback, new libcs and libnxp needed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1133 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-09 13:52:30 +00:00
focus
6877f01525 Testing record/timeshift problems with CI 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1122 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-08 11:59:31 +00:00
seife
6b23e1264a dmx_cs header: fix 'qualifiers ignored' compiler warning 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1092 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 13:25:35 +00:00
focus
ab0f7f731c - Remove some globals from vcrcontrol 
- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-25 17:22:38 +00:00
satbaby
e75375ae3d -fix compil warrnings 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@984 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-31 14:58:54 +00:00
seife
2590adfe15 add generic dispatcher headers for frontend etc 
add generic audio, video and demux headers in zapit/include (TODO: put them
into a better place, or put wrappers into lib directories) that automatically
dispatch to the hardware specific functions and use them in the code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@962 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-12-25 17:43:28 +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
satbaby
15c474a6d8 fix Wextra compil 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-09-14 17:13:29 +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
6a9eb40ec3 add new files 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@635 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-06-19 18:24:09 +00:00