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

Merge branch 'master' into pu/mp

Browse Source 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
This commit is contained in:
svenhoefer
2017-03-20 01:31:51 +01:00
parent 66ea57d710 b8a97a97ca
commit b12624d1fa
12 changed files with 174 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/lcdd.cpp
View File

@@ -358,6 +358,7 @@ void CLCD::setlcdparameter(int dimm, const int contrast, const int power, const
perror("[lcdd] set invert failed!");
}
#if 0
if (g_info.box_Type == CControld::TUXBOX_MAKER_PHILIPS)
{
if (ioctl(fd, LCD_IOCTL_BIAS, &bias) < 0)
@@ -365,6 +366,7 @@ void CLCD::setlcdparameter(int dimm, const int contrast, const int power, const
perror("[lcdd] set bias failed!");
}
}
#endif
close(fd);
}
#endif

8
src/driver/neutrinofonts.cpp
View File

@@ -269,10 +269,12 @@ int CNeutrinoFonts::getDynFontSize(int dx, int dy, std::string text, int style)
if (text.empty()) tmpText = "x";
_width = dynFont->getRenderWidth(tmpText);
if ((_height > dy) || (_width > dx)) {
if (dynFlag)
if (dynFlag){
dynSize--;
else
printf("##### [%s] Specified size (dx=%d, dy=%d) too small, use minimal font size.\n", __FUNCTION__, dx, dy);
}else{
if (debug)
printf("##### [%s] Specified size (dx=%d, dy=%d) too small, use minimal font size.\n", __FUNCTION__, dx, dy);
}
break;
}
else if ((_height < dy) || (_width < dx)) {