mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,665 Commits 2 Branches 9 Tags
537154e3c78eb98cece82f30f21da1421679a1c2
Commit Graph

71 Commits

Author SHA1 Message Date
TangoCash
537154e3c7 pictureviewer: fix segfault if no channelid is present 
Origin commit data
------------------
Commit: 3a49fa37b9
Author: TangoCash <eric@loxat.de>
Date: 2018-09-20 (Thu, 20 Sep 2018)
 2018-09-20 14:18:07 +02:00
vanhofen
c48a115366 helpers: rework new random-functions to get the code more reuseable 
* introduceand use LOGODIR_TMP (storage dir for webchannel logos)


Origin commit data
------------------
Commit: 2d3f66aa39
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-18 (Tue, 18 Sep 2018)

Origin message was:
------------------
- helpers: rework new random-functions to get the code more reuseable

* introduceand use LOGODIR_TMP (storage dir for webchannel logos)
 2018-09-18 21:18:40 +02:00
TangoCash
0b0ce4843d fix infoviewer 
Origin commit data
------------------
Commit: 3eb09d615b
Author: TangoCash <eric@loxat.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)
 2018-09-09 17:20:15 +02:00
vanhofen
9cb677714b pictureviewer: search for e2 picons in LOGODIR_VAR and LOGODIR too 
Origin commit data
------------------
Commit: f08d1f9392
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)

Origin message was:
------------------
- pictureviewer: search for e2 picons in LOGODIR_VAR and LOGODIR too
 2018-09-09 13:06:05 +02:00
TangoCash
60ee492710 adding support for E2 picons 
Origin commit data
------------------
Commit: 2c1e9952f7
Author: TangoCash <eric@loxat.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)
 2018-09-09 13:06:05 +02:00
TangoCash
2068925288 use alternative logo if present 
Origin commit data
------------------
Commit: 477264a4c6
Author: TangoCash <eric@loxat.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)
 2018-09-09 13:06:05 +02:00
vanhofen
dacaa76427 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/icons/headers/mainmenue.png
	data/icons/headers/settings.png
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/settings_manager.cpp


Origin commit data
------------------
Commit: d756ed789a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)
 2017-12-17 23:38:33 +01:00
Thilo Graf
104d6d3211 CPictureViewer: add current image into debug line 
It's not possible to see which file causes this error.


Origin commit data
------------------
Commit: fc2629eec5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-17 (Sun, 17 Dec 2017)
 2017-12-17 14:02:39 +01:00
gixxpunk
58da03034b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 39559213cd
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
 2017-06-13 18:32:25 +02:00
Jacek Jendrzej
ee3c3bb268 2 supplement to 3acaf2653e 
Origin commit data
------------------
Commit: 85cff28f07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
 2017-06-13 14:30:37 +02:00
Jacek Jendrzej
336aa4f1fa supplement to 3acaf2653e 
Origin commit data
------------------
Commit: 30b1c3f286
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
 2017-06-13 14:23:56 +02:00
Jacek Jendrzej
3acaf2653e src/driver/pictureviewer/pictureviewer.cpp add bufferram and cached to calc freemem 
Origin commit data
------------------
Commit: 1f0a1bfdf2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)

Origin message was:
------------------
src/driver/pictureviewer/pictureviewer.cpp add bufferram and cached to calc freemem
 2017-06-13 13:34:17 +02:00
vanhofen
013d9ab919 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 336e0f4c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
 2017-04-19 21:29:41 +02:00
Jacek Jendrzej
6d87909523 fix download pic from ssl url 
Origin commit data
------------------
Commit: f6482eb042
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-18 (Tue, 18 Apr 2017)
 2017-04-18 19:09:32 +02:00
vanhofen
8eaed748dd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: f47b58c9db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 15:17:28 +01:00
Jacek Jendrzej
0ed64a8b8b fix needed mem check 
Origin commit data
------------------
Commit: 833a65c9e4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 12:43:27 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +01:00
Jacek Jendrzej
f5f669a803 src/driver/pictureviewer/pictureviewer.cpp Picviewer need double image bufferSize for avoid segfault 
Origin commit data
------------------
Commit: e15f31fee4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-11 (Sat, 11 Feb 2017)
 2017-02-11 21:08:25 +01:00
Jacek Jendrzej
cd8728e2a7 src/driver/pictureviewer/pictureviewer.cpp check whether there is enough free memory for the image buffer 
Origin commit data
------------------
Commit: 80f6e611ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-10 (Fri, 10 Feb 2017)

Origin message was:
------------------
src/driver/pictureviewer/pictureviewer.cpp check whether there is enough free memory for the image buffer
 2017-02-10 20:33:15 +01:00
vanhofen
b2210d8a75 fix build; try to port our framebuffer changes (need fixes!) 
Origin commit data
------------------
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)
 2017-02-08 09:45:53 +01:00
vanhofen
1bfaf6b895 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b631bd57ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 08:49:24 +01:00
Jacek Jendrzej
ce095eea35 pictureviewer: fix possible segfault if width or height < 1,fix possible memleak 
Origin commit data
------------------
Commit: 5ea4cbf145
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-01 (Tue, 01 Nov 2016)
 2016-11-01 14:50:08 +01:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
a787c2990d avoid division by zero 
Origin commit data
------------------
Commit: 49c86a38b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)
 2016-04-21 18:14:46 +02:00
Jacek Jendrzej
dc832e6eea pictureviewer.cpp fix possible memleak 
Origin commit data
------------------
Commit: 93f3007be1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
 2016-02-16 12:59:43 +01:00
vanhofen
5ebaefc5f2 move LOGODIR and LOGODIR_VAR to global.h 
Origin commit data
------------------
Commit: 11ccc53f0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- move LOGODIR and LOGODIR_VAR to global.h
 2015-05-06 22:58:54 +02:00
vanhofen
3429bd79b2 fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h 
Origin commit data
------------------
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
 2015-05-06 22:58:54 +02:00
Thilo Graf
c287fbfb4d CPictureViewer: fix wconversion warnings 
Origin commit data
------------------
Commit: 2dc47e0fe1
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
 2015-03-29 22:40:07 +02:00
Thilo Graf
82cc2eef02 CPictureViewer: use neutrino internal log 
Show only errors in mode DEBUG_NORMAL.


Origin commit data
------------------
Commit: 6151152a20
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-14 (Wed, 14 Jan 2015)
 2015-03-29 22:40:07 +02:00
vanhofen
3641bd7bf7 pictureviewer: do only show picture if decoding succeed 
based upon patch "fix screensaver" by max10 <max_10@gmx.de>


Origin commit data
------------------
Commit: ff1a7b8640
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-19 (Thu, 19 Mar 2015)

Origin message was:
------------------
- 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
Jacek Jendrzej
f3426c5dc0 pictureviewer.cpp: CPictureViewer::DownloadImage remove double add CURLOPT_NOSIGNA 
Origin commit data
------------------
Commit: d58f621769
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
 2015-02-04 15:52:40 +01:00
Jacek Jendrzej
2a86d6f32e pictureviewer.cpp: CPictureViewer::DownloadImage add curl timeout opt 
Origin commit data
------------------
Commit: 1121e6210e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
 2015-02-04 15:35:13 +01:00
[CST] Focus
57aa4f1b23 driver/pictureviewer/pictureviewer.cpp: change supported formats order 
Origin commit data
------------------
Commit: b2a7aabe15
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)
 2014-09-27 16:21:43 +04:00
martii
547d900fee 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


Origin commit data
------------------
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
 2014-09-12 18:29:21 +04:00
Jacek Jendrzej
e289800456 /pictureviewer.cpp CPictureViewer::GetLogoName: don't add the same dir twice 
Origin commit data
------------------
Commit: c86ad2ef48
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-05-26 (Mon, 26 May 2014)
 2014-05-26 16:55:02 +02:00
Jacek Jendrzej
e88412e904 CPictureViewer:: move download code to separate funktion DownloadImage 
Origin commit data
------------------
Commit: 80d7cc186d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-03-19 (Wed, 19 Mar 2014)
 2014-03-19 18:32:34 +01:00
vanhofen
3e159995f1 pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo) 
Origin commit data
------------------
Commit: 7ab37854c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-07 (Fri, 07 Mar 2014)

Origin message was:
------------------
- pictureviewer: add a var-dir for channellogos (/var/tuxbox/icons/logo)
 2014-03-07 23:03:57 +01:00
vanhofen
988ba92051 pictureviewer: readd fallback to the std logo directory in flash 
Origin commit data
------------------
Commit: 50ee98c3c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-07 (Mon, 07 Oct 2013)

Origin message was:
------------------
- pictureviewer: readd fallback to the std logo directory in flash
 2013-10-07 17:19:27 +02:00
Thilo Graf
0aea432f02 CComponentsPicture: add class CComponentsChannelLogo 
Origin commit data
------------------
Commit: 992cac1a55
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-05 (Sat, 05 Oct 2013)
 2013-10-06 17:14:31 +02:00
Thilo Graf
d965659949 CPictureViewer: rework GetLogoName 
Evaluation with real channel name was broken.


Origin commit data
------------------
Commit: 662fbe2dec
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-04 (Fri, 04 Oct 2013)
 2013-10-06 17:14:31 +02:00
[CST] Focus
4b3373edbb driver/pictureviewer/pictureviewer.cpp: add support to get file from url, (c) martii <m4rtii@gmx.de> 
Origin commit data
------------------
Commit: a876b074ed
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
 2013-09-03 18:23:20 +04:00
Jacek Jendrzej
26c50aa485 src/driver/pictureviewer/pictureviewer.cpp: move free handlers to ~CPictureViewer(), fix segfault aufter commit d9aaafa0f1 
Origin commit data
------------------
Commit: 725b3eb27c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)

Origin message was:
------------------
src/driver/pictureviewer/pictureviewer.cpp: move free handlers to ~CPictureViewer(), fix segfault aufter commit d9aaafa0f1
 2013-04-24 12:03:58 +02:00
Stefan Seyfried
766356ec59 pictureviewer: free formathandlers in destructor 
Origin commit data
------------------
Commit: 4f31b4e779
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
f5a8635bf0 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


Origin commit data
------------------
Commit: 166e403965
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
 2013-03-12 17:16:13 +04: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
Jacek Jendrzej
c4dfb269fc biggest chan number in list (revised) 
Origin commit data
------------------
Commit: 441cba7d4a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
 2012-07-07 21:10:10 +02:00
Jacek Jendrzej
803674f9df fix gcc 4.7.x warnings 
Origin commit data
------------------
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
 2012-07-07 13:09:08 +02:00
Jacek Jendrzej
dc8f52a399 never used value 
Origin commit data
------------------
Commit: 6ec13051a1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-06 (Sun, 06 May 2012)
 2012-05-06 14:10:48 +02:00
Michael Liebmann
367fbc656e 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


Origin commit data
------------------
Commit: 5fee27085d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-03-19 (Mon, 19 Mar 2012)

Origin message was:
------------------
* 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
Michael Liebmann
5321c4c754 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


Origin commit data
------------------
Commit: 6bbef9a0f6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-02-07 (Tue, 07 Feb 2012)

Origin message was:
------------------
* 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