mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,337 Commits 1 Branch 51 Tags
bcc38b9b4d790ef1cf5a51e2bc3d0d2a303cde16
Commit Graph

61 Commits

Author SHA1 Message Date
Stefan Seyfried
3a728f9ee1 Makefiles: simplify includes for libcoolstream/libstb-hal 2013-11-11 21:51:08 +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
Michael Liebmann
5091e920fc Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am 2013-10-17 04:22:49 +02:00
Stefan Seyfried
c68ffa2155 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment
 2013-09-28 13:01:03 +02:00
Stefan Seyfried
31d0b88ca1 dvbsubtitle: add missing blit() 2013-06-01 17:17:28 +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
Michael Liebmann
1fb105b361 * dvbsubtitle: Fix segfault in destructor 2013-05-04 18:20:52 +01:00
Stefan Seyfried
227bf9f2e8 dvbsubtitle: free avcodec context in destructor 2013-04-05 15:54:12 +04: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
d3d2efe475 Makefiles.am: add conditional include for libcoolstream 2013-01-11 14:17:16 +04:00
[CST] Focus
6e41c65fad merge public git changes 2013-01-09 19:30:07 +04:00
Stefan Seyfried
5394321ea8 dvbsubtitle: free avcodec context in destructor 2012-10-31 22:57:51 +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
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02: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
micha-bbg
f36ee26d87 * Add missing $(top_builddir) to Makefile.am 2012-04-27 16:54:01 +01:00
Stefan Seyfried
269cbbe512 dvbsub: fix unused-var compiler warnings 2012-04-17 19:33:58 +02:00
Stefan Seyfried
a029333c1a neutrino: adapt to the framebuffer_spark blitter change 
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content
 2012-04-17 19:33:57 +02:00
Stefan Seyfried
40532a9d67 dvbsub: use the FB backbuffer on spark 2012-04-17 19:33:56 +02:00
Stefan Seyfried
33a24a25f0 dvbsub: ratelimit 'bad start code' messages 2012-04-17 19:33:56 +02:00
Stefan Seyfried
9509da25a7 dvbsub: use blitter to scale subtitles on spark 2012-04-17 19:33:56 +02:00
Stefan Seyfried
b6eb045c9b dvbsub: fix scaling 
Scale subtitles to full FB size, disregard OSD setup area. Reason: the
video decoder plane also does not consider OSD setup and subtitles
should align with video. Additionally, subtitles were too narrow.
TODO: what about letterboxed formats? Not handled yet.

Code is experimental, thus the original is #if 0'ed out only.
 2012-04-17 19:33:55 +02:00
Stefan Seyfried
7f10c6673e dvbsub: do not clear subtitles more than once 2012-04-17 19:33:55 +02:00
Stefan Seyfried
6f5e4238cc libneutrino-hal is now libstb-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
Stefan Seyfried
41a2f7a803 neutrino: TD-dvbsub fix did break coolstream dvbsub 2012-04-17 19:33:51 +02:00
Stefan Seyfried
ae38a828f0 libdvbsub: hacks to try to improve the situation on TD 
those don't really help yet, unfortunately
 2012-04-17 19:33:47 +02:00
focus
fad27bc5a6 lib/libdvbsub/dvbsubtitle.cpp: fix API use to new ffmpeg 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2168 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-28 16:16:32 +00:00
[CST] Bas
ee52c56a6d dvbsub: fix API use to new ffmpeg. 2012-03-27 18:29:05 +04:00
[CST] Focus
90db393eeb revert lib/libdvbsub/dvbsubtitle.cpp 2012-03-25 16:34:19 +04:00
[CST] Bas
9edfbf491d dvbsub: fix API use to new ffmpeg. 2012-03-23 12:26:23 +04:00
[CST] Bas
ce9eb10ed0 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup 
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp
 2012-03-08 12:17:03 +08:00
satbaby
2591100c42 remove never used volues 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-04 17:25:48 +00:00
[CST] Bas
b04b3f270a lib: fix compile after include change. 2012-03-04 15:53:33 +08:00
satbaby
2105867ec5 dvbsubtitle:-fix for 1280x subtitel 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2057 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-13 16:16:38 +00:00
seife
e9fb741134 fix "converting to non-pointer type 'pthread_t'" compiler warning 
pthread_t is - at least on our platform - not a pointer type, but
basically an int
don't assign NULL but 0 to fix that warning

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1440 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-07 09:06:03 +00:00
satbaby
85f5e1110d memcpy -> memmove 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-09 12:55:31 +00:00
seife
40655b9b6e libdvbsub: tone down debug output, shut up libavcodec 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1089 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 12:34:50 +00:00
seife
695507903c libdvbsub: speed up exit during shutdown 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1088 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 12:34:48 +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
nightshad
1dcb710611 compatibility with newer ffmpeg. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@823 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-10-08 07:55:59 +00:00
focus
7177949c91 Fix infobar after virtual zap 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@314 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-11 10:54:33 +00:00
focus
6a7a057cf9 dont stop dvb subs pid data caching on pause 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@311 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-10 15:34:26 +00:00
satbaby
8f59cc96ec change 'long long' tom int64_t'; change variable buf to new delete; 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-07 14:32:21 +00:00
focus
e473ac833b Attempt to fix #233 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@253 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-03 16:04:27 +00:00
focus
1a8ea714b9 another try to feet scaled subs to user-defined screen edges 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@218 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-29 13:57:54 +00:00
focus
ef3acb6c5a Fix scaled subtitles overlap 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@217 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-28 14:52:29 +00:00
focus
f46f291ce9 scale dvb subtitles 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@216 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-27 20:41:42 +00:00
focus
2444fc5f58 More hacks about subtitles... 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@189 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-20 14:10:54 +00:00
focus
b554e4ef4e TTX subs menu, not ready yet, just backup of current code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@184 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-19 11:22:08 +00:00