Commit Graph

169 Commits

Author SHA1 Message Date
Stefan Seyfried
473f33e57f pictureviewer: free formathandlers in destructor 2013-04-14 18:42:20 +02:00
Stefan Seyfried
166e403965 neutrino: fix most hardcoded paths
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp
2013-03-12 17:16:13 +04:00
Stefan Seyfried
f63ddb9cce neutrino: fix most hardcoded paths 2013-03-11 13:32:06 +01:00
Stefan Seyfried
ffd4daea7c neutrino: fix most hardcoded paths 2013-03-10 02:01:52 +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
Stefan Seyfried
c9eafa208e pictureviewer: compatibility with giflib-5.x 2013-03-06 11:28:17 +01:00
Stefan Seyfried
7e701bfefc Merge branch 'uncool/dvbsi++' commit 1320462626
Conflicts:
	src/eitd/SIevents.cpp
2013-01-29 21:27:41 +01:00
[CST] Focus
5776c67825 Merge branch 'dvbsi++' into next 2013-01-29 17:42:19 +04:00
satbaby
460e224a28 fix compil warnings 2013-01-22 17:27:51 +01:00
[CST] Focus
d3d2efe475 Makefiles.am: add conditional include for libcoolstream 2013-01-11 14:17:16 +04:00
Stefan Seyfried
2c07e391a1 pictureviewer: compatibility with giflib-5.x 2012-12-28 13:57:46 +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
Thilo Graf
cc8a1c6a7c clean up: sort sourcefiles in makefiles 2012-07-08 22:01:11 +02:00
satbaby
441cba7d4a biggest chan number in list (revised) 2012-07-07 21:10:10 +02:00
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +02:00
[CST] Focus
ca705c251b delete unused files in src/driver/pictureviewer dir 2012-06-14 11:14:08 +04:00
satbaby
6ec13051a1 never used value 2012-05-06 14:10:48 +02:00
micha-bbg
f36ee26d87 * Add missing $(top_builddir) to Makefile.am 2012-04-27 16:54:01 +01: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
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
[CST] Focus
b9bc799cf1 fix conflicts 2012-03-20 11:14:05 +04:00
micha-bbg
5fee27085d * Moviebrowser: disabled 'pseudo' transparency for display screenshot
- Global setting for picture / icon transparency can be made
  in framebuffer constuctor
- Default is old standard (transparency when Black Content)
- Individual transparency with CFrameBuffer::SetTransparent()

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2155 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-19 21:40:03 +00:00
[CST] Bas
bec26850a3 driver: fix compile after include change. 2012-03-04 15:50:19 +08:00
micha-bbg
6bbef9a0f6 * Add paint background to paintIcon() / DisplayImage()
- paint background before display icon in CFrameBuffer::paintIcon()
- paint background before display image in CPictureViewer::DisplayImage()

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2082 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-02-07 11:12:45 +00:00
micha-bbg
2e473b97d4 * Pictureviewer: Supported image formats
- Added function to determine the supported image formats
- Is required by moviebrowser.cpp (display screenshot)


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1988 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-23 06:10:00 +00:00
focus
3a414300b8 Fix fd leak
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1956 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-08 14:27:25 +00:00
micha-bbg
4f4f46a912 Correct calculation of the size of logo in list header.
- Function for calculating from infoviewer.cpp to pictureviewer.cpp moved
- Correct calculation in channellist.cpp, epgview.cpp and moviebrowser.cpp


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1869 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-21 23:11:52 +00:00
micha-bbg
c4514851fe - printf, which are unnecessary from pictureviewer.cpp and png.cpp removed
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1761 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-10-19 20:28:01 +00:00
micha-bbg
ccb9fceec7 - add support for 24bit PNGs with alpha-channel in function CPictureViewer::getIcon
- code optimized pictureviewer.cpp (CPictureViewer::getIcon / CPictureViewer::getImage)
- code optimized png.cpp (fh_png_load / png_load_ext)


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1753 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-10-08 02:55:04 +00:00
striper
44bc69c4f5 - add better check to ensure logo is really PNG
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1717 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-28 06:31:09 +00:00
striper
c17e7cf960 - fix non *.png logos
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1716 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-27 18:58:46 +00:00
striper
d8f8a99d86 - add support for 24bit PNGs with alpha-channel
- modify resize function

If you encounter problems please report here including a log: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/10561-transparente-senderlogos/?s=d3381092abb5a81271ebfa0c4219f73f0ba7b8ca

THX micha_bbg!

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1715 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-27 15:41:31 +00:00
striper
6ac50d55ca - revert Rev. 1689 because this commit probably only hides the real problem
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1690 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-15 15:33:19 +00:00
striper
7658db6423 - cs_malloc_uncached() infrequently generates neutrino segfaults, so let's use malloc as a workaround
- add a check if fbbuff is NULL

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1689 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-14 14:36:21 +00:00
striper
9871d76311 - fix compiler warning with new libpng
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1500 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-02 15:20:50 +00:00
striper
5ce9743995 - allow *.png as logo. todo: fix transparency (patch by FlatTV)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1415 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-04-24 10:59:19 +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
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
daf195c662 libpng 1.5 compile fixes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1270 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-07 09:06:10 +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
seife
7a98888017 pictureviewer: rename config.h to pv_config.h
this avoids confusion with the global config.h, which in turn
caused very hard to debug runtime failures when objects were
compiled with different defines, causing e.g. g_settings to
have different sizes...

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1022 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-08 22:37:13 +00:00
satbaby
8f02a26307 -add eligible logo dir
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@996 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-03 10:41:58 +00:00
satbaby
60161ff9c2 -fix resource leak
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@989 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-01 16:03:24 +00:00
seife
2e037a6b73 use libcoolstream includes for CS and libtriple for TD
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@963 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-25 17:43:35 +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
seife
435807a491 - fix necessary for out-of-source build
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@912 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-11-28 22:00:58 +00:00
satbaby
386afa1245 fix close & osd
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@846 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-10-19 10:02:44 +00:00