Commit Graph

39 Commits

Author SHA1 Message Date
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
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
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
Stefan Seyfried
248fd86b6a fb_generic: remove hardware specific #ifdef
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fdc4c7178
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
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
vanhofen
e67e33d323 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-13 23:29:07 +01:00
vanhofen
315955cc0d Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2017-02-13 21:41:04 +01:00
Michael Liebmann
3903507312 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


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

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
Michael Liebmann
9fe7ca7e26 CFbAccelCSHD2: Add scaleFont()function for font upscaling when fullhd is aktiv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88c834221b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-13 12:51:14 +01:00
vanhofen
4a34f577b3 fix last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e3193a126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- fix last merge

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

------------------
This commit was generated by Migit
2017-02-12 23:58:55 +01:00
vanhofen
b838e4a638 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/fb_accel.h
	src/driver/fb_accel_glfb.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/gui/bookmarkmanager.cpp
	src/gui/epgview.h
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/gui/widget/buttons.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-02-12 23:50:14 +01:00
vanhofen
4ac4e963ad 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
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
2956e6d7f9 pu/fb-modules: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


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

Origin message was:
------------------
pu/fb-modules: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


------------------
This commit was generated by Migit
2017-02-12 09:24:51 +01:00
vanhofen
ab0fdc2825 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 20:22:37 +01:00
Stefan Seyfried
d5e49d8b99 fb_generic: remove unused VT switching / restoring code
Origin commit data
------------------
Branch: ni/coolstream
Commit: d498917594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 12:57:18 +01:00
Stefan Seyfried
581cd70b90 fb_generic: make paintLine virtual
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1500716fcf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 12:57:17 +01:00
Stefan Seyfried
237bcba91b fb_generic: remove unused VT switching / restoring code
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb3710eaed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-09 00:01:08 +01:00
Stefan Seyfried
b23b11e91c fb_generic: make paintLine virtual
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e9dddeabd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-08 23:37:19 +01:00
vanhofen
8872419ed1 fix build; try to port our framebuffer changes (need fixes!)
Origin commit data
------------------
Branch: ni/coolstream
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!)

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

------------------
This commit was generated by Migit
2017-02-08 09:45:53 +01:00
Michael Liebmann
68a1c5e30e neutrino: Replace USE_NEVIS_GXA with hardware-specific macros
- Existing USE_NEVIS_GXA definitions in the build system
 (neutrino configure) can be removed.


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

Origin message was:
------------------
neutrino: Replace USE_NEVIS_GXA with hardware-specific macros

- Existing USE_NEVIS_GXA definitions in the build system
 (neutrino configure) can be removed.


------------------
This commit was generated by Migit
2017-02-08 06:06:24 +01:00
Stefan Seyfried
7d945c2d59 fb_accel: add accelerated framebuffer for Nevis GXA chips
Signed-off-by: M. Liebmann <git@tuxcode.de>


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



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
182635f6f5 fb_generic: add fb_name member to identify fb implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58193dd56
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
36b131ea30 fb_generic: add pointer for double-buffered fb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ba84a629a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
b98cfca434 fb_generic: remove all hardware specific code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f63080454
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
f3ef901b2c fb_generic: add stuff needed for compilation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c381cd53b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
2395351f78 start modularizing framebuffer acceleration architecture
This is just copied framebuffer.{h,cpp} => fb_generic.{h,cpp}
The idea is to implement CFrameBuffer as generic framebuffer class that
does work on almost every hardware without acceleration and / or
hardware dependencies.
CFbAccel will be a derived class (and different on many architectures)
which implements the accelerated functions.
This does not yet compile, verbatim copies to track development history.


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



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
cdfb1da8ec fb_generic: add fb_name member to identify fb implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 257ffd9ee3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-05 19:53:29 +01:00
Stefan Seyfried
49592c98cd fb_generic: add pointer for double-buffered fb
Origin commit data
------------------
Branch: ni/coolstream
Commit: b767d1ef41
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-05 18:04:15 +01:00
Stefan Seyfried
3d2f2dbda4 fb_generic: remove all hardware specific code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1034642093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-05 15:22:22 +01:00
Stefan Seyfried
92bb894b58 fb_generic: add stuff needed for compilation
Origin commit data
------------------
Branch: ni/coolstream
Commit: ceb82a4b47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-05 15:02:20 +01:00
Stefan Seyfried
295352759e start modularizing framebuffer acceleration architecture
This is just copied framebuffer.{h,cpp} => fb_generic.{h,cpp}
The idea is to implement CFrameBuffer as generic framebuffer class that
does work on almost every hardware without acceleration and / or
hardware dependencies.
CFbAccel will be a derived class (and different on many architectures)
which implements the accelerated functions.
This does not yet compile, verbatim copies to track development history.


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



------------------
This commit was generated by Migit
2017-02-05 14:49:41 +01:00