Commit Graph

33 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
157d631d5b Code cleanup, still testing
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@173 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-17 15:47:34 +00:00
seife
d283eb4a58 dvbsubtitle: fix lots of debug output if dvbsub is not running
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@166 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-16 12:27:32 +00:00
focus
83e422bfea Drop vdr code, use ffmpeg dvb sub decoder. atm patched ffmpeg used
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@153 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-11 20:03:38 +00:00
focus
7a554d8f54 testing dvb subtitles
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@128 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-30 14:47:04 +00:00
focus
cacfc2360b testing dvb subtitles
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@126 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-29 18:33:45 +00:00
mws
69928c641b fix shadowed stuff that in reality was case sensitive naming of variables but sucks for me\!
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@116 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-22 15:41:49 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-08 11:05:11 +00:00