mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-02-20 00:11:48 +01:00
parent 43dbfed1ba b7110faaf6
commit d76c9c536c
8 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -5595,7 +5595,7 @@ void CopyBB2FB()
{
fb_pixel_t *src, *dst, *topsrc;
int fillcolor, i, screenwidth, swtmp;
#ifdef HAVE_SPARK_HARDWARE
#if defined(HAVE_SPARK_HARDWARE) || defined(BOXMODEL_CS_HD2)
CFrameBuffer *f = CFrameBuffer::getInstance();
#endif
@@ -5620,6 +5620,8 @@ void CopyBB2FB()
#else
#ifdef HAVE_SPARK_HARDWARE
f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true);
#elif defined BOXMODEL_CS_HD2
f->fbCopyArea(var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, var_screeninfo.yres);
#else
if ((uint32_t)stride > var_screeninfo.xres) {
fb_pixel_t *lfb_ = lfb;
@@ -5678,12 +5680,16 @@ void CopyBB2FB()
if (screenmode == 1)
{
screenwidth = ( TV43STARTX );
#ifdef HAVE_SPARK_HARDWARE
#if defined(HAVE_SPARK_HARDWARE) || defined(BOXMODEL_CS_HD2)
int cx = var_screeninfo.xres - TV43STARTX; /* x start */
int cw = TV43STARTX; /* width */
int cy = StartY;
int ch = 24*fontheight;
#endif
#ifdef HAVE_SPARK_HARDWARE
f->blit2FB(lbb, cw, ch, cx, cy, cx, cy, true);
#elif defined BOXMODEL_CS_HD2
f->fbCopyArea(cw, ch, cx, cy, cx, cy+var_screeninfo.yres);
#else
fb_pixel_t *topdst = dst;
size_t width = (ex - screenwidth) * sizeof(fb_pixel_t);