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

Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup

Browse Source 
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp
This commit is contained in:
[CST] Bas
2012-03-08 12:17:03 +08:00
parent 96e7c51cff a41d93a686
commit ce9eb10ed0
46 changed files with 526 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -3383,8 +3383,6 @@ void ConfigMenu(int Init)
void PageInput(int Number)
{
int zoom = 0;
/* clear temp_page */
if (inputcounter == 2)
temp_page = 0;
@@ -3416,9 +3414,6 @@ void PageInput(int Number)
CopyBB2FB();
}
if (zoommode == 1)
zoom = 1<<10;
PosY = StartY;
switch (inputcounter)
@@ -3915,7 +3910,7 @@ void SwitchScreenMode(int newscreenmode)
{
ClearFB(clearbbcolor);
int fw, fh, tx, ty, tw, th;
int fw, tx, ty, tw, th;
if (screenmode==1) /* split with topmenu */
{
@@ -3923,7 +3918,6 @@ void SwitchScreenMode(int newscreenmode)
int w = CFrameBuffer::getInstance()->getScreenWidth();
int h = CFrameBuffer::getInstance()->getScreenHeight();
fw = fontwidth_topmenumain;
fh = fontheight;
tx = 0; /* split means we start at the left edge */
sx = x;
@@ -3951,7 +3945,6 @@ void SwitchScreenMode(int newscreenmode)
{
StartX = CFrameBuffer::getInstance()->getScreenX();
fw = fontwidth_small;
fh = fontheight;
tx = TV169FULLSTARTX;
ty = TV169FULLSTARTY;
tw = TV169FULLWIDTH;
@@ -4905,7 +4898,7 @@ void RenderCharLCDsmall(int Char, int XPos, int YPos)
void RenderMessage(int Message)
{
int byte;
int fbcolor, timecolor, imenuatr;
int fbcolor, imenuatr;
int pagecolumn;
const char *msg;
int national_subset_back = national_subset;
@@ -4930,7 +4923,6 @@ void RenderMessage(int Message)
/* set colors */
fbcolor = transp;
timecolor = transp<<4 | transp;
imenuatr = ATR_MSG0;
/* clear framebuffer */