mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,928 Commits 2 Branches 9 Tags
dd48defda4093e54366fa90deacc578eb848e24e
Commit Graph

90 Commits

Author SHA1 Message Date
TangoCash
dd48defda4 keep all logo-naming conventions together 
Origin commit data
------------------
Commit: 978fcedcbe
Author: TangoCash <eric@loxat.de>
Date: 2020-09-20 (Sun, 20 Sep 2020)
 2020-09-20 21:10:53 +02:00
TangoCash
b2faa95c1a add some special character conversion 
Origin commit data
------------------
Commit: a682d4b74d
Author: TangoCash <eric@loxat.de>
Date: 2020-09-15 (Tue, 15 Sep 2020)
 2020-09-19 13:27:38 +02:00
Jacek Jendrzej
923c98f4ec partial revert:pictureviewer: fix logic,picture can be bigger than display 
Origin commit data
------------------
Commit: a85ccd9191
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-02-02 (Sun, 02 Feb 2020)
 2020-02-02 21:26:36 +01:00
Jacek Jendrzej
efdf6e3746 pictureviewer: fix logic,picture can be bigger than display 
Origin commit data
------------------
Commit: 293719f187
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-02-02 (Sun, 02 Feb 2020)
 2020-02-02 21:26:36 +01:00
Jacek Jendrzej
9f5489c3ab pictureviewer: fix possible integer_overflow 
Origin commit data
------------------
Commit: eba5864fb2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-02-02 (Sun, 02 Feb 2020)
 2020-02-02 21:26:35 +01:00
vanhofen
c4bc4c3ef7 pictureviewer: fix display of eventlogos; we don't have the ENABLE_LCD4LINUX define 
Origin commit data
------------------
Commit: 0b70770a22
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-14 (Tue, 14 Jan 2020)

Origin message was:
------------------
- pictureviewer: fix display of eventlogos; we don't have the ENABLE_LCD4LINUX define
 2020-01-14 23:51:20 +01:00
Jacek Jendrzej
bf0937d53c fix compiler warnings 
Origin commit data
------------------
Commit: 9c62e80325
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-01-09 (Thu, 09 Jan 2020)
 2020-01-09 21:37:16 +01:00
vanhofen
03adc73f87 pictureviewer: masking some more chars in event logo names 
Origin commit data
------------------
Commit: 6a1c0ab46b
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-04 (Thu, 04 Apr 2019)

Origin message was:
------------------
- pictureviewer: masking some more chars in event logo names
 2019-04-04 20:55:30 +02:00
Jacek Jendrzej
9112865e66 fix stack buffer overflow if icon pic is broken 
Origin commit data
------------------
Commit: d8d07eddf7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-03-09 (Sat, 09 Mar 2019)
 2019-03-09 21:05:49 +01:00
vanhofen
d1b7cd74da osd-setup: allow to enable/disable event logos 
Origin commit data
------------------
Commit: 7115402334
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-25 (Tue, 25 Dec 2018)

Origin message was:
------------------
- osd-setup: allow to enable/disable event logos
 2018-12-25 01:12:16 +01:00
TangoCash
826d7f342b show event logos only in infoviewer 
Origin commit data
------------------
Commit: 9433cf88e5
Author: TangoCash <eric@loxat.de>
Date: 2018-12-25 (Tue, 25 Dec 2018)
 2018-12-25 01:12:16 +01:00
vanhofen
c6a9fc33c5 pictureviewer: more string replacements for eventlogo in GetLogoName() 
Origin commit data
------------------
Commit: 74833dfa47
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)

Origin message was:
------------------
- pictureviewer: more string replacements for eventlogo in GetLogoName()
 2018-12-18 22:21:14 +01:00
vanhofen
ea417f55b9 pictureviewer: massively simplify GetLogoName() function 
Origin commit data
------------------
Commit: 90545ad4fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)

Origin message was:
------------------
- pictureviewer: massively simplify GetLogoName() function
 2018-12-18 00:19:35 +01:00
vanhofen
50dd8ff34c pictureviewer: add support for g_settings.lcd4l_logodir to GetLogoName() function 
Origin commit data
------------------
Commit: f9cd35290a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)

Origin message was:
------------------
- pictureviewer: add support for g_settings.lcd4l_logodir to GetLogoName() function
 2018-12-18 00:19:35 +01:00
vanhofen
e1877ac7c0 introduce eventlogos (e.g. tagesschau.png for Tagesschau) 
Eventlogo name is created from lowercase event name. Sspaces are replaced by "-".
 So an event called "American Dad" needs a logo called "american-dad.png".

 Eventlogo must be located in a subdir called "/events" in the logo directories.

 The search is working backwards through the eventname like this:

 "/var/tuxbox/icons/logo/events/american-dad.jpg"
 "/var/tuxbox/icons/logo/events/american-da.jpg"
 "/var/tuxbox/icons/logo/events/american-d.jpg"
 "/var/tuxbox/icons/logo/events/american-.jpg"
 "/var/tuxbox/icons/logo/events/american.jpg"
 "/var/tuxbox/icons/logo/events/america.jpg"
 "/var/tuxbox/icons/logo/events/americ.jpg"
 "/var/tuxbox/icons/logo/events/ameri.jpg"
 "/var/tuxbox/icons/logo/events/amer.jpg"
 "/var/tuxbox/icons/logo/events/ame.jpg"
 "/var/tuxbox/icons/logo/events/am.jpg"
 "/var/tuxbox/icons/logo/events/a.jpg"

 First hit is used. If no eventlogo was found, the wellknown channellogos are used.
 Be carefull with the naming of the eventlogos. A logo named "a.png" will be used
 for all events starting with an A.


Origin commit data
------------------
Commit: 4275fabed6
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)

Origin message was:
------------------
- introduce eventlogos (e.g. tagesschau.png for Tagesschau)

 Eventlogo name is created from lowercase event name. Sspaces are replaced by "-".
 So an event called "American Dad" needs a logo called "american-dad.png".

 Eventlogo must be located in a subdir called "/events" in the logo directories.

 The search is working backwards through the eventname like this:

 "/var/tuxbox/icons/logo/events/american-dad.jpg"
 "/var/tuxbox/icons/logo/events/american-da.jpg"
 "/var/tuxbox/icons/logo/events/american-d.jpg"
 "/var/tuxbox/icons/logo/events/american-.jpg"
 "/var/tuxbox/icons/logo/events/american.jpg"
 "/var/tuxbox/icons/logo/events/america.jpg"
 "/var/tuxbox/icons/logo/events/americ.jpg"
 "/var/tuxbox/icons/logo/events/ameri.jpg"
 "/var/tuxbox/icons/logo/events/amer.jpg"
 "/var/tuxbox/icons/logo/events/ame.jpg"
 "/var/tuxbox/icons/logo/events/am.jpg"
 "/var/tuxbox/icons/logo/events/a.jpg"

 First hit is used. If no eventlogo was found, the wellknown channellogos are used.
 Be carefull with the naming of the eventlogos. A logo named "a.png" will be used
 for all events starting with an A.
 2018-12-18 00:19:35 +01:00
vanhofen
b4d591ff3a pictureviewer: just small code formatting changes in GetLogoName() 
Origin commit data
------------------
Commit: c0bcdffbb9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)

Origin message was:
------------------
- pictureviewer: just small code formatting changes in GetLogoName()
 2018-12-18 00:19:35 +01:00
TangoCash
51ea8c94bb add special logo names support 
Origin commit data
------------------
Commit: 8915440aa6
Author: TangoCash <eric@loxat.de>
Date: 2018-12-18 (Tue, 18 Dec 2018)
 2018-12-18 00:19:35 +01:00
TangoCash
89dc11525a webtv: fix segfault while reload 
Origin commit data
------------------
Commit: 685c42ad90
Author: TangoCash <eric@loxat.de>
Date: 2018-09-24 (Mon, 24 Sep 2018)

Origin message was:
------------------
-webtv: fix segfault while reload
 2018-09-24 21:23:12 +02:00
TangoCash
8dd38e9ccc adding caching xmltv logos 
Origin commit data
------------------
Commit: 3955d83961
Author: TangoCash <eric@loxat.de>
Date: 2018-09-20 (Thu, 20 Sep 2018)
 2018-09-20 15:11:05 +02:00
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