Commit Graph

71 Commits

Author SHA1 Message Date
vanhofen
bad03fe56c 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
------------------
Commit: 8f312e1d00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:50:14 +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
Michael Liebmann
0e6e6db7bd pu/fb-modules: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
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
2017-02-12 09:24:51 +01:00
vanhofen
4d15c4d61b 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
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 20:22:37 +01:00
Stefan Seyfried
7a63618598 fb_generic: remove unused VT switching / restoring code
Origin commit data
------------------
Commit: d498917594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
937b418f74 fb_generic: make paintLine virtual
Origin commit data
------------------
Commit: 1500716fcf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:17 +01:00
Stefan Seyfried
99290ad429 fb_generic: remove unused VT switching / restoring code
Origin commit data
------------------
Commit: cb3710eaed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 00:01:08 +01:00
Stefan Seyfried
d8efeec6ea fb_generic: make paintLine virtual
Origin commit data
------------------
Commit: 7e9dddeabd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 23:37:19 +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
Michael Liebmann
65c62740eb 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
------------------
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.
2017-02-08 06:06:24 +01:00
Stefan Seyfried
b22ade9c3c fb_accel: add accelerated framebuffer for Nevis GXA chips
Signed-off-by: M. Liebmann <git@tuxcode.de>


Origin commit data
------------------
Commit: 0e63e5df3d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
96e1de6a36 fb_generic: add fb_name member to identify fb implementation
Origin commit data
------------------
Commit: a58193dd56
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
48c1187acd fb_generic: add pointer for double-buffered fb
Origin commit data
------------------
Commit: 9ba84a629a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
6f744bcf77 fb_generic: remove all hardware specific code
Origin commit data
------------------
Commit: 3f63080454
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
59b946fc8d fb_generic: add stuff needed for compilation
Origin commit data
------------------
Commit: 3c381cd53b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
aaab6db1b9 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
------------------
Commit: 5c2ee5e137
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
200e157ab7 fb_generic: add fb_name member to identify fb implementation
Origin commit data
------------------
Commit: 257ffd9ee3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 19:53:29 +01:00
Stefan Seyfried
a660042581 fb_generic: add pointer for double-buffered fb
Origin commit data
------------------
Commit: b767d1ef41
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 18:04:15 +01:00
Stefan Seyfried
013559aca5 fb_generic: remove all hardware specific code
Origin commit data
------------------
Commit: 1034642093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 15:22:22 +01:00
Stefan Seyfried
af3e552eff fb_generic: add stuff needed for compilation
Origin commit data
------------------
Commit: ceb82a4b47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 15:02:20 +01:00
Stefan Seyfried
24349b64ae 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
------------------
Commit: 3256978c58
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 14:49:41 +01:00