mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,953 Commits 2 Branches 9 Tags
ae983fb14566209a8fe5dc12ff156da59247ebbc
Commit Graph

32 Commits

Author SHA1 Message Date
Stefan Seyfried
ae983fb145 dvbsubtitle: add missing blit() 
Origin commit data
------------------
Commit: 31d0b88ca1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)
 2013-06-01 17:17:28 +02:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Michael Liebmann
a404406809 dvbsubtitle: Fix segfault in destructor 
Origin commit data
------------------
Commit: 1fb105b361
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)

Origin message was:
------------------
* dvbsubtitle: Fix segfault in destructor
 2013-05-04 18:20:52 +01:00
Stefan Seyfried
29998498f3 dvbsubtitle: free avcodec context in destructor 
Origin commit data
------------------
Commit: 227bf9f2e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
 2013-04-05 15:54:12 +04:00
Stefan Seyfried
d9a837683e dvbsubtitle: free avcodec context in destructor 
Origin commit data
------------------
Commit: 5394321ea8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
 2012-10-31 22:57:51 +01:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3' 
...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
 2012-10-14 12:51:07 +02:00
Jacek Jendrzej
9868a4308b remove doubles include 
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
 2012-09-11 20:31:33 +02:00
Stefan Seyfried
ddcd3618e0 dvbsub: fix unused-var compiler warnings 
Origin commit data
------------------
Commit: 269cbbe512
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
 2012-04-17 19:33:58 +02:00
Stefan Seyfried
3dda6ee00f 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


Origin commit data
------------------
Commit: a029333c1a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
 2012-04-17 19:33:57 +02:00
Stefan Seyfried
d60586fded dvbsub: use the FB backbuffer on spark 
Origin commit data
------------------
Commit: 40532a9d67
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-19 (Mon, 19 Mar 2012)
 2012-04-17 19:33:56 +02:00
Stefan Seyfried
26aa05084e dvbsub: use blitter to scale subtitles on spark 
Origin commit data
------------------
Commit: 9509da25a7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-14 (Wed, 14 Mar 2012)
 2012-04-17 19:33:56 +02:00
Stefan Seyfried
63f4a7ebff 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.


Origin commit data
------------------
Commit: b6eb045c9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-14 (Wed, 14 Mar 2012)
 2012-04-17 19:33:55 +02:00
Stefan Seyfried
2a88adef61 dvbsub: do not clear subtitles more than once 
Origin commit data
------------------
Commit: 7f10c6673e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-14 (Wed, 14 Mar 2012)
 2012-04-17 19:33:55 +02:00
Stefan Seyfried
ebdd41aac5 neutrino: TD-dvbsub fix did break coolstream dvbsub 
Origin commit data
------------------
Commit: 41a2f7a803
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)
 2012-04-17 19:33:51 +02:00
Stefan Seyfried
cde88b183e libdvbsub: hacks to try to improve the situation on TD 
those don't really help yet, unfortunately


Origin commit data
------------------
Commit: ae38a828f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-02-27 (Sun, 27 Feb 2011)
 2012-04-17 19:33:47 +02:00
[CST] Focus
6e5e275127 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


Origin commit data
------------------
Commit: fad27bc5a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-28 (Wed, 28 Mar 2012)
 2012-03-28 16:16:32 +00:00
[CST] Bas
9cc4e69a02 dvbsub: fix API use to new ffmpeg. 
Origin commit data
------------------
Commit: ee52c56a6d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-23 (Fri, 23 Mar 2012)
 2012-03-27 18:29:05 +04:00
[CST] Focus
b5e25cdaa5 revert lib/libdvbsub/dvbsubtitle.cpp 
Origin commit data
------------------
Commit: 90db393eeb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-25 (Sun, 25 Mar 2012)
 2012-03-25 16:34:19 +04:00
[CST] Bas
2837091dc5 dvbsub: fix API use to new ffmpeg. 
Origin commit data
------------------
Commit: 9edfbf491d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-23 (Fri, 23 Mar 2012)
 2012-03-23 12:26:23 +04:00
Jacek Jendrzej
9c1915814b dvbsubtitle:-fix for 1280x subtitel 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2057 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 2105867ec5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
 2012-01-13 16:16:38 +00:00
Stefan Seyfried
db56a28c34 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


Origin commit data
------------------
Commit: 40655b9b6e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-30 (Sun, 30 Jan 2011)
 2011-01-30 12:34:50 +00:00
[CST] Focus
c80ada267e 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


Origin commit data
------------------
Commit: 6a7a057cf9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-10 (Wed, 10 Feb 2010)
 2010-02-10 15:34:26 +00:00
[CST] Focus
d92d178def 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


Origin commit data
------------------
Commit: 1a8ea714b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-29 (Fri, 29 Jan 2010)
 2010-01-29 13:57:54 +00:00
[CST] Focus
aabab5517c Fix scaled subtitles overlap 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@217 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ef3acb6c5a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-28 (Thu, 28 Jan 2010)
 2010-01-28 14:52:29 +00:00
[CST] Focus
83333661ed scale dvb subtitles 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@216 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: f46f291ce9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-27 (Wed, 27 Jan 2010)
 2010-01-27 20:41:42 +00:00
[CST] Focus
23087fd341 Code cleanup, still testing 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@173 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 157d631d5b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-17 (Sun, 17 Jan 2010)
 2010-01-17 15:47:34 +00:00
Stefan Seyfried
a6008ef953 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


Origin commit data
------------------
Commit: d283eb4a58
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-16 (Sat, 16 Jan 2010)
 2010-01-16 12:27:32 +00:00
[CST] Focus
e65ff9eca8 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


Origin commit data
------------------
Commit: 83e422bfea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-11 (Mon, 11 Jan 2010)
 2010-01-11 20:03:38 +00:00
[CST] Focus
4f81bd2eac testing dvb subtitles 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@128 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 7a554d8f54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2009-12-30 (Wed, 30 Dec 2009)
 2009-12-30 14:47:04 +00:00
[CST] Focus
6951f8a426 testing dvb subtitles 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@126 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: cacfc2360b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2009-12-29 (Tue, 29 Dec 2009)
 2009-12-29 18:33:45 +00:00
mws
c399c652f1 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


Origin commit data
------------------
Commit: 69928c641b
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-22 (Tue, 22 Dec 2009)
 2009-12-22 15:41:49 +00:00
mrcolor
cb8dd3394d 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
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
 2009-12-08 11:05:11 +00:00