Commit Graph

79 Commits

Author SHA1 Message Date
vanhofen
a8e6b8be20 remove obsolete define SCALE2RES_DEFINED
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39a8ee32e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-08-25 (Thu, 25 Aug 2022)

Origin message was:
------------------
- remove obsolete define SCALE2RES_DEFINED

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2022-08-25 21:39:33 +02:00
TangoCash
6bc4a63f28 supplemental to 04a8e71a22
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f1d347682
Author: TangoCash <eric@loxat.de>
Date: 2021-10-29 (Fri, 29 Oct 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2021-10-29 19:33:33 +02:00
redblue-pkt
3aaa9c30d9 update glcd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c2dcc9eb1
Author: redblue-pkt <redblue-pkt@orange.pl>
Date: 2020-06-19 (Fri, 19 Jun 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2020-06-19 23:56:12 +02:00
Thilo Graf
106db80d75 fb_generic: add possibility to handle with unscaled images in showFrame()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05cf31b3dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-02-06 (Thu, 06 Feb 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2020-02-06 00:16:05 +01:00
Thilo Graf
749b0d648c fb_generic: use parameters as const ref, catch possible dimension error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 304b93955a
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-11-09 (Sat, 09 Nov 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-11-09 12:07:41 +01:00
Thilo Graf
d9ffa381db fb_generic: use const int by ref for more safety
Origin commit data
------------------
Branch: ni/coolstream
Commit: 216ebf8365
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-10-27 (Sun, 27 Oct 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-10-27 22:56:50 +01:00
Thilo Graf
bb4ef67205 fb_generic.h: avoid multiple define of fb_pixel_t
Is already defined with build config inside configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: a5af09ba13
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-04-18 (Thu, 18 Apr 2019)



------------------
This commit was generated by Migit
2019-04-18 22:22:58 +02:00
Thilo Graf
8528e62a2f framebuffer: add optional fallback handlings for showFrame() methode
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6423da903
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-03-12 (Tue, 12 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-12 22:00:12 +01:00
GetAway
72c0b1802c screensaver.cpp: use fallback if video decoder is busy
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c66036c2a
Author: GetAway <get-away@t-online.de>
Date: 2019-03-12 (Tue, 12 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2019-03-12 22:00:11 +01:00
Thilo Graf
ce756e1100 src/driver/fb_generic.cpp/h: use methode showFrame() as bool function
Allows the evaluation of this function for conditions if needed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecb1190014
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-10-03 (Wed, 03 Oct 2018)



------------------
This commit was generated by Migit
2018-10-03 18:01:22 +02:00
Thilo Graf
cc6680d34e src/driver/fb_generic.h: use unified define for fb device name
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c555a7d3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2018-07-29 22:36:51 +02:00
vanhofen
a8bbad2772 framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


------------------
This commit was generated by Migit
2018-01-22 12:06:15 +01:00
vanhofen
a4ebf460c1 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9d1c7be17
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 11:40:03 +02:00
Jacek Jendrzej
383e466472 Fix merge-error; add missing add_gxa_sync_marker() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b781da031
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 11:36:14 +02:00
vanhofen
c09cdaff18 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-09 10:37:47 +02:00
Jacek Jendrzej
4052e6868c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-08 20:06:40 +02:00
vanhofen
aa022d1ee4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 15:54:12 +02:00
Thilo Graf
dad04f2202 CFrameBuffer: fb-generic.cpp - add methode for clean up icon cache
This could be required eg. on changed resoulutions or
changed iconsets on runtime.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e66739ff5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-07 16:20:47 +02:00
vanhofen
45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
Michael Liebmann
10ea5b08d2 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-13 21:55:50 +01:00
vanhofen
ae3ecfdcfb Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 16:14:33 +01:00
vanhofen
7dcc90f09f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
2017-03-13 12:45:30 +01:00
vanhofen
51c85e1c58 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-13 12:40:04 +01:00
vanhofen
5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 16:55:39 +01:00
vanhofen
bf56f9f0bc Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:36:23 +01:00
Michael Liebmann
760a820f78 osd resolution: Add 'mode' to osd_resolution_struct_t
- Use COsdSetup::OSDMODE_XXX enums to identify various resolutions


Origin commit data
------------------
Branch: ni/coolstream
Commit: 653e574937
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
vanhofen
fa47395bcd Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e83babe2c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-27 (Mon, 27 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-27 08:01:20 +01:00
Michael Liebmann
9fecf3d4c5 fb_generic: Add "#define SCALE2RES_DEFINED" to check...
...presence of 'CFrameBuffer::scale2Res()'

 - Revert this patch when pu/fb-setmode branch is merged to master


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fea75f428
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-27 (Mon, 27 Feb 2017)



------------------
This commit was generated by Migit
2017-02-27 00:24:07 +01:00
vanhofen
2623c0d848 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)



------------------
This commit was generated by Migit
2017-02-26 00:45:36 +01:00
Stefan Seyfried
4635eb375c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 08:44:53 +01:00
vanhofen
3b3c8d975b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-21 15:14:59 +01:00
vanhofen
7e6242f666 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-21 15:14:31 +01:00
Michael Liebmann
d27afe52d0 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb0d7afa95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-21 06:39:24 +01:00
Stefan Seyfried
adb8a608d5 fb_generic: add swidth variable, "stride in fb_pixel_t units"
this should allow to use fb_pixel_t pointer arithmetics more often
instead of byte pointers


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c7d5f08dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
vanhofen
477d25a765 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3c5b557d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-20 12:30:00 +01:00
vanhofen
bb60fbe8a2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit
2017-02-20 12:29:23 +01:00
Michael Liebmann
5b18cd2d9d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: d76c9c536c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-20 00:11:48 +01:00
Michael Liebmann
c7cbed3137 framebuffer: Add fbCopyArea function
- Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
 without hardware acceleration


Origin commit data
------------------
Branch: ni/coolstream
Commit: cc5a1b3b31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
framebuffer: Add fbCopyArea function

 - Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
  without hardware acceleration


------------------
This commit was generated by Migit
2017-02-20 00:09:46 +01:00
vanhofen
7df8d3e4ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d894829c43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-19 23:35:31 +01:00
vanhofen
eabacd65bf Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: db9e856c38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-19 23:22:48 +01:00
vanhofen
22c66526da framebuffer: rename scaleFont() to scale2Res()
Origin commit data
------------------
Branch: ni/coolstream
Commit: e631c3e3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- framebuffer: rename scaleFont() to scale2Res()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-19 23:22:12 +01:00
vanhofen
6bb52f0731 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 22:54:00 +01:00
vanhofen
5708ad998c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 21:52:59 +01:00
Stefan Seyfried
b3e69e0a64 fb_generic: add swidth variable, "stride in fb_pixel_t units"
this should allow to use fb_pixel_t pointer arithmetics more often
instead of byte pointers


Origin commit data
------------------
Branch: ni/coolstream
Commit: a6fc59ad6c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit
2017-02-15 20:30:52 +01:00
Stefan Seyfried
ba84b4493a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d9d81d448
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-15 20:26:44 +01:00
Michael Liebmann
78a5a4a658 Merge branch 'master' into pu/fb-setmode
Fix merge conflict


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
2017-02-14 20:11:08 +01:00
Michael Liebmann
c940801136 fb_generic: make blitBox2FB virtual
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8ec4540ca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-14 20:01:55 +01:00
Michael Liebmann
e618203c09 fb_generic.h: Add missing function add_gxa_sync_marker()
- is required for cs hd1


Origin commit data
------------------
Branch: ni/coolstream
Commit: de80748cac
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
2017-02-14 20:01:55 +01:00
Stefan Seyfried
ddb457bc90 implement getWidth4FB_HW_ACC in fb_accel class
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
2017-02-14 20:01:55 +01:00