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

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2017-02-22 08:44:53 +01:00
parent 9b8524b37b 5cac45ccb8
commit 5c95139207
13 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -5524,7 +5524,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
@@ -5537,6 +5537,8 @@ void CopyBB2FB()
{
#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
memcpy(lfb, lbb, fix_screeninfo.line_length*var_screeninfo.yres);
#endif
@@ -5574,12 +5576,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);