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

tuxtxt: use one global CFrameBuffer variable

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f22e740f8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-06-21 (Thu, 21 Jun 2018)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2018-06-21 21:38:23 +02:00
committed by vanhofen
parent f75b152053
commit 0f41651247
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -40,6 +40,7 @@ static bool use_gui;
static int cfg_national_subset;
static int screen_x, screen_y, screen_w, screen_h;
static CFrameBuffer *fbp;
fb_pixel_t *getFBp(int &y)
{
@@ -257,7 +258,7 @@ void ClearBB(fb_pixel_t color)
void ClearFB(int /*color*/)
{
//memset(lfb,0, var_screeninfo.yres*var_screeninfo.xres);
CFrameBuffer::getInstance()->paintBackground();
fbp->paintBackground();
}
#if 0
@@ -1595,6 +1596,7 @@ int tuxtx_main(int pid, int page, int source)
{
char cvs_revision[] = "$Revision: 1.95 $";
fbp = CFrameBuffer::getInstance();
use_gui = 1;
boxed = 0;
oldboxed = boxed;
@@ -1617,7 +1619,6 @@ int tuxtx_main(int pid, int page, int source)
printf("TuxTxt %s\n", versioninfo);
printf("for 32bpp framebuffer\n");
CFrameBuffer *fbp = CFrameBuffer::getInstance();
lfb = fbp->getFrameBufferPointer();
lbb = fbp->getBackBufferPointer();
@@ -2768,7 +2769,7 @@ void Menu_Init(char *menu, int current_pid, int menuitem, int hotindex)
menu[MenuLine[M_PID]*Menu_Width + 27] = '?';
/* render menu */
PosY = Menu_StartY;
CFrameBuffer::getInstance()->waitForIdle();
fbp->waitForIdle();
for (line = 0; line < Menu_Height; line++)
{
PosX = Menu_StartX;
@@ -3973,8 +3974,7 @@ void SwitchScreenMode(int newscreenmode)
setfontwidth(fw);
CFrameBuffer *f = CFrameBuffer::getInstance();
videoDecoder->Pig(tx, ty, tw, th, f->getScreenWidth(true), f->getScreenHeight(true));
videoDecoder->Pig(tx, ty, tw, th, fbp->getScreenWidth(true), fbp->getScreenHeight(true));
}
else /* not split */
{
@@ -4992,7 +4992,7 @@ void RenderMessage(int Message)
else
msg = &message_3[menulanguage][0];
CFrameBuffer::getInstance()->waitForIdle();
fbp->waitForIdle();
/* render infobar */
PosX = StartX + fontwidth+5;
PosY = StartY + fontheight*16;
@@ -5560,7 +5560,6 @@ void CopyBB2FB()
{
fb_pixel_t *src, *dst, *topsrc;
int fillcolor, i, screenwidth;
CFrameBuffer *f = CFrameBuffer::getInstance();
/* line 25 */
if (!pagecatching && use_gui)
@@ -5569,7 +5568,7 @@ void CopyBB2FB()
/* copy backbuffer to framebuffer */
if (!zoommode[boxed])
{
f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true);
fbp->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true);
/* adapt background of backbuffer if changed */
if (StartX > 0 && *lfb != *lbb) {
@@ -5606,14 +5605,14 @@ void CopyBB2FB()
if (screenmode[boxed] == 1)
{
screenwidth = TV43STARTX;
f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, TV43STARTX, 0, TV43STARTX, 0, true);
fbp->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, TV43STARTX, 0, TV43STARTX, 0, true);
}
else if (screenmode[boxed] == 2)
screenwidth = TV169FULLSTARTX;
else
screenwidth = var_screeninfo.xres;
f->paintBox(0, 0, screenwidth, StartY, argb[fillcolor]);
fbp->paintBox(0, 0, screenwidth, StartY, argb[fillcolor]);
for (i = 12*fontheight; i; i--)
{
@@ -5624,8 +5623,8 @@ void CopyBB2FB()
src += var_screeninfo.xres;
}
f->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres);
f->paintBox(0, StartY + 25 * fontheight, screenwidth, var_screeninfo.yres, argb[fillcolor]);
fbp->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres);
fbp->paintBox(0, StartY + 25 * fontheight, screenwidth, var_screeninfo.yres, argb[fillcolor]);
}
/******************************************************************************