Commit Graph

169 Commits

Author SHA1 Message Date
TangoCash
031f8eb12c keep all logo-naming conventions together 2020-09-24 17:12:10 +02:00
TangoCash
90eb785d2b add some special character conversion 2020-09-20 12:57:44 +02:00
DboxOldie
2a6f0e9e5e enable limit macros 2020-07-04 23:04:31 +02:00
Jacek Jendrzej
073eef6463 partial revert:pictureviewer: fix logic,picture can be bigger than display 2020-02-02 17:20:50 +01:00
Jacek Jendrzej
f6bdc07f84 pictureviewer: fix logic,picture can be bigger than display 2020-02-02 14:13:12 +01:00
Jacek Jendrzej
97381484ce pictureviewer: fix possible integer_overflow 2020-02-02 14:09:47 +01:00
Jacek Jendrzej
eef536a737 fix compiler warnings 2020-01-09 09:52:52 +01:00
svenhoefer
c0971287ad - pictureviewer: masking some more chars in event logo names
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-04-06 23:58:02 +02:00
Jacek Jendrzej
41963aca29 fix stack buffer overflow if icon pic is broken 2019-03-09 20:09:28 +01:00
J. Krieg
beed663788 src/driver/pictureviewer/pictureviewer.cpp: fix fix compil without LCD4LINUX
v_path.push_back(g_settings.logo_hdd_dir) does not relate to LCD4Linux

Signed-off-by: GetAway <get-away@t-online.de>
2019-01-03 15:33:05 +01:00
Jacek Jendrzej
e97c8d03fe fix compil without LCD4LINUX 2019-01-03 11:27:46 +01:00
svenhoefer
52e49c25f4 - osd-setup: allow to enable/disable event logos
Conflicts:
	src/gui/osd_setup.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-01-01 14:36:27 +01:00
TangoCash
93f74ef829 show event logos only in infoviewer 2018-12-31 15:18:15 +01:00
svenhoefer
6d53bf7967 - pictureviewer: more string replacements for eventlogo in GetLogoName()
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:45 +01:00
svenhoefer
a48c387bbd - pictureviewer: massively simplify GetLogoName() function
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:45 +01:00
svenhoefer
deede1bd92 - pictureviewer: add support for g_settings.lcd4l_logodir to GetLogoName() function
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:45 +01:00
svenhoefer
4e21dd5c44 - 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.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:45 +01:00
svenhoefer
0132429dfc - pictureviewer: just small code formatting changes in GetLogoName()
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:44 +01:00
TangoCash
91fb19ff22 add special logo names support
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-12-31 11:47:44 +01:00
TangoCash
1473bca983 -webtv: fix segfault while reload
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-10-02 23:24:54 +02:00
TangoCash
42e7b0a55f adding caching xmltv logos
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-10-02 23:24:53 +02:00
TangoCash
13c645ed61 pictureviewer: fix segfault if no channelid is present
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-10-02 23:24:53 +02:00
svenhoefer
f5754b74f2 - helpers: rework new random-functions to get the code more reuseable
* introduceand use LOGODIR_TMP (storage dir for webchannel logos)

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-10-02 23:24:52 +02:00
TangoCash
360a70da28 fix infoviewer
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-09-09 20:25:58 +02:00
svenhoefer
cb8e772305 - pictureviewer: search for e2 picons in LOGODIR_VAR and LOGODIR too
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-09-09 20:25:57 +02:00
TangoCash
aeab1ae0bd adding support for E2 picons
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-09-09 20:25:57 +02:00
TangoCash
f4512218b4 use alternative logo if present
Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-09-09 20:25:57 +02:00
Thilo Graf
fc2629eec5 CPictureViewer: add current image into debug line
It's not possible to see which file causes this error.
2017-12-17 14:02:39 +01:00
Jacek Jendrzej
b7ceb705a0 Merge branch 'master' into pu/mp 2017-09-26 12:52:04 +02:00
Stefan Seyfried
125eb6a7d1 pictureviewer: fix build with gcc7 2017-09-26 12:41:05 +02:00
Stefan Seyfried
9e2a7d7f79 add LUA_CFLAGS everywhere widget/menue.h is used 2017-09-26 12:41:05 +02:00
Jacek Jendrzej
2c5bf73006 Merge branch 'master' into pu/mp 2017-09-13 13:40:40 +02:00
Jacek Jendrzej
6576729fd1 remove double includes 2017-09-08 21:21:32 +02:00
Jacek Jendrzej
4c3002cb26 Merge branch 'master' into pu/mp 2017-06-15 12:32:31 +02:00
Jacek Jendrzej
85cff28f07 2 supplement to 1f0a1bfdf2 2017-06-13 14:30:37 +02:00
Jacek Jendrzej
30b1c3f286 supplement to 1f0a1bfdf2 2017-06-13 14:23:56 +02:00
Jacek Jendrzej
1f0a1bfdf2 src/driver/pictureviewer/pictureviewer.cpp add bufferram and cached to calc freemem 2017-06-13 13:34:17 +02:00
svenhoefer
11a28c07d6 Merge branch 'master' into pu/mp 2017-04-19 21:35:56 +02:00
Jacek Jendrzej
f6482eb042 fix download pic from ssl url 2017-04-18 19:09:32 +02:00
svenhoefer
7dfd4184ae Merge branch 'master' into pu/mp 2017-03-27 18:15:27 +02:00
Jacek Jendrzej
833a65c9e4 fix needed mem check 2017-03-23 12:43:27 +01:00
Stefan Seyfried
2819e651c3 Merge remote-tracking branch 'tuxbox/pu/fb-modules'
only compile tested ;-)
2017-02-12 21:29:10 +01:00
M. Liebmann
0cb26e6e98 Merge branch 'master' into pu/fb-modules 2017-02-12 09:24:08 +01:00
Jacek Jendrzej
e15f31fee4 src/driver/pictureviewer/pictureviewer.cpp Picviewer need double image bufferSize for avoid segfault 2017-02-11 21:08:25 +01:00
Stefan Seyfried
8b47699447 Merge remote-tracking branch 'tuxbox/master' 2017-02-11 11:18:45 +01:00
M. Liebmann
81bcddaad1 Merge branch 'master' into pu/fb-modules 2017-02-10 23:26:32 +01:00
Jacek Jendrzej
80f6e611ba src/driver/pictureviewer/pictureviewer.cpp check whether there is enough free memory for the image buffer 2017-02-10 20:33:15 +01:00
Stefan Seyfried
e490f84ea8 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
63b6efd1f5 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)
2017-02-05 13:05:07 +01:00
Stefan Seyfried
a409047714 Merge remote-tracking branch 'tuxbox/master' 2017-01-22 22:59:39 +01:00