Commit Graph

169 Commits

Author SHA1 Message Date
GetAway
b5138018b5 gcc-6.2 compil fixes 2017-01-21 14:01:05 +01:00
M. Liebmann
617075c30e src/driver/pictureviewer/png.cpp: Fix -Wclobbered compiler warning 2017-01-03 16:45:16 +01:00
M. Liebmann
79d9b88ae1 src/driver/pictureviewer/png.cpp: Add support for gray scale PNGs...
...with alpha channel
2017-01-01 23:09:54 +01:00
Stefan Seyfried
2c92d112d0 Merge remote-tracking branch 'tuxbox/master' 2016-11-12 18:06:26 +01:00
Jacek Jendrzej
5ea4cbf145 pictureviewer: fix possible segfault if width or height < 1,fix possible memleak 2016-11-01 14:50:08 +01:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
Jacek Jendrzej
49c86a38b4 avoid division by zero 2016-04-21 18:14:46 +02:00
Jacek Jendrzej
93f3007be1 pictureviewer.cpp fix possible memleak 2016-02-16 12:59:43 +01:00
Stefan Seyfried
572de2bbcb Merge remote-tracking branch 'cst-next' 2016-01-16 12:51:04 +01:00
Stefan Seyfried
79d800f955 - port HWLIB_CFLAGS from neutrino-mp to neutrino-hd 2016-01-14 22:29:00 +01:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
svenhoefer
11ccc53f0b - move LOGODIR and LOGODIR_VAR to global.h 2015-05-06 22:58:54 +02:00
svenhoefer
89a11de651 - fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h 2015-05-06 22:58:54 +02:00
Thilo Graf
2dc47e0fe1 CPictureViewer: fix wconversion warnings 2015-03-29 22:40:07 +02:00
Thilo Graf
6151152a20 CPictureViewer: use neutrino internal log
Show only errors in mode DEBUG_NORMAL.
2015-03-29 22:40:07 +02:00
svenhoefer
ff1a7b8640 - pictureviewer: do only show picture if decoding succeed
based upon patch "fix screensaver" by max10 <max_10@gmx.de>
2015-03-19 10:54:45 +01:00
Stefan Seyfried
6b787d8d31 pictureviewer/gif: fix build with giflib-5.1+ 2015-02-09 13:47:32 +01:00
Stefan Seyfried
66adad0811 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp
2015-02-07 23:12:01 +01:00
Stefan Seyfried
4e9a40cfb3 pictureviewer/gif: fix build with giflib-5.1+ 2015-02-06 21:58:48 +01:00
Jacek Jendrzej
d58f621769 pictureviewer.cpp: CPictureViewer::DownloadImage remove double add CURLOPT_NOSIGNA 2015-02-04 15:52:40 +01:00
Jacek Jendrzej
1121e6210e pictureviewer.cpp: CPictureViewer::DownloadImage add curl timeout opt 2015-02-04 15:35:13 +01:00
Stefan Seyfried
fe5a6ec111 picview/png, my_popen: fix -Wclobbered warnings 2015-02-04 12:35:51 +01:00
Stefan Seyfried
283a6c30eb picview/png, my_popen: fix -Wclobbered warnings 2015-01-26 19:30:23 +01:00
Stefan Seyfried
a92eb8f8e7 add CFLAGS for libsigc 2015-01-02 21:00:18 +01:00
Stefan Seyfried
41dd237498 add CFLAGS for libsigc 2014-12-25 18:11:36 +01:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
[CST] Focus
b2a7aabe15 driver/pictureviewer/pictureviewer.cpp: change supported formats order 2014-09-27 16:21:43 +04:00
martii
a99e8df965 driver/pictureviewer/jpeg: remove server-based rescaling code
Conflicts:
	src/system/settings.h
2014-09-15 17:28:39 +04:00
martii
b21cb152b5 system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp
2014-09-12 18:29:21 +04:00
Thilo Graf
e6f6931b72 CComponentsPicture: use current instance of CPictureViewer
reduce precautionary too much unnecessary impact
2014-06-27 20:38:59 +02:00
Jacek Jendrzej
c86ad2ef48 /pictureviewer.cpp CPictureViewer::GetLogoName: don't add the same dir twice 2014-05-26 16:55:02 +02:00
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2014-04-27 19:14:06 +02:00
Jacek Jendrzej
80d7cc186d CPictureViewer:: move download code to separate funktion DownloadImage 2014-03-19 18:32:34 +01:00
svenhoefer
7ab37854c6 - pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo) 2014-03-07 23:03:57 +01:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing
2013-12-22 21:25:05 +01:00
Jacek Jendrzej
ececd844fa use mySleep in CComponentsFrmClock::initClockThread(
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
2013-12-15 17:40:32 +01:00
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
svenhoefer
50ee98c3c9 - pictureviewer: readd fallback to the std logo directory in flash 2013-10-07 17:19:27 +02:00
Thilo Graf
992cac1a55 CComponentsPicture: add class CComponentsChannelLogo 2013-10-06 17:14:31 +02:00
Thilo Graf
662fbe2dec CPictureViewer: rework GetLogoName
Evaluation with real channel name was broken.
2013-10-06 17:14:31 +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
[CST] Focus
a876b074ed driver/pictureviewer/pictureviewer.cpp: add support to get file from url, (c) martii <m4rtii@gmx.de> 2013-09-03 18:23:20 +04: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
Stefan Seyfried
23ec489390 remove unneeded libpng version checks 2013-05-01 16:37:58 +02:00
Jacek Jendrzej
725b3eb27c src/driver/pictureviewer/pictureviewer.cpp: move free handlers to ~CPictureViewer(), fix segfault aufter commit 833fb32197 2013-04-24 12:03:58 +02:00
[CST] Focus
8bb70d1ab3 Merge branch 'pu/cc' into next-cc
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h
2013-04-17 13:32:12 +04:00
Stefan Seyfried
4f31b4e779 pictureviewer: free formathandlers in destructor 2013-04-17 10:21:33 +04:00
Stefan Seyfried
833fb32197 pictureviewer: free formathandlers in destructor 2013-04-15 19:42:44 +02:00