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

- lcd4linux: prepare for some more Samsung SPF types

Browse Source 
Signed-off-by: GetAway <get-away@t-online.de>
This commit is contained in:
svenhoefer
2019-01-05 20:53:35 +01:00
committed by GetAway
parent 8549307a9f
commit 9b9c900ab6
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/driver/lcd4l.cpp
View File

@@ -229,11 +229,13 @@ int CLCD4l::GetMaxBrightness()
switch (g_settings.lcd4l_display_type) switch (g_settings.lcd4l_display_type)
{ {
case SAMSUNG: case SAMSUNG800x480:
case VUSOLO4K: case SAMSUNG800x600:
case SAMSUNG1024x600:
case VUSOLO4K480x320:
max_brightness = 10; max_brightness = 10;
break; break;
case PEARL: case PEARL320x240:
default: default:
max_brightness = 7; max_brightness = 7;
break; break;
@@ -765,18 +767,27 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
std::string DisplayType; std::string DisplayType;
switch (g_settings.lcd4l_display_type) { switch (g_settings.lcd4l_display_type) {
case 3: case PNG:
DisplayType = "PNG_"; DisplayType = "PNG_";
break; break;
#if defined BOXMODEL_VUSOLO4K #if defined BOXMODEL_VUSOLO4K
case 2: case VUSOLO4K480x320:
DisplayType = "VUSolo4K_"; DisplayType = "VUSolo4K_";
break; break;
#endif #endif
case 1: case SAMSUNG800x480:
//DisplayType = "Samsung800x480_";
DisplayType = "Samsung_"; DisplayType = "Samsung_";
break; break;
case 0: case SAMSUNG800x600:
//DisplayType = "Samsung800x600_";
DisplayType = "Samsung_";
break;
case SAMSUNG1024x600:
//DisplayType = "Samsung1024x600_";
DisplayType = "Samsung_";
break;
case PEARL320x240:
default: default:
DisplayType = "Pearl_"; DisplayType = "Pearl_";
break; break;
@@ -1024,6 +1035,8 @@ bool CLCD4l::WriteFile(const char *file, std::string content, bool convert)
strReplace(content, "Ä", "\xc4\0"); strReplace(content, "Ä", "\xc4\0");
strReplace(content, "Ö", "\xd6\0"); strReplace(content, "Ö", "\xd6\0");
strReplace(content, "Ü", "\xdc\0"); strReplace(content, "Ü", "\xdc\0");
if (g_settings.lcd4l_display_type == PEARL320x240)
strReplace(content, "ß", "\xe2\0");
strReplace(content, "Ą", "\x41\0"); strReplace(content, "Ą", "\x41\0");
strReplace(content, "ą", "\x61\0"); strReplace(content, "ą", "\x61\0");
@@ -1044,7 +1057,6 @@ bool CLCD4l::WriteFile(const char *file, std::string content, bool convert)
strReplace(content, "Ź", "\x5a\0"); strReplace(content, "Ź", "\x5a\0");
strReplace(content, "ż", "\x7a\0"); strReplace(content, "ż", "\x7a\0");
if (g_settings.lcd4l_display_type == PEARL) strReplace(content, "ß", "\xe2\0");
strReplace(content, "é", "e"); strReplace(content, "é", "e");
} }

10
src/driver/lcd4l.h
View File

@@ -41,10 +41,12 @@ class CLCD4l
// Displays // Displays
enum enum
{ {
PEARL = 0, PEARL320x240 = 0,
SAMSUNG = 1, SAMSUNG800x480 = 1,
VUSOLO4K = 2, SAMSUNG800x600 = 2,
PNG = 3 SAMSUNG1024x600 = 3,
VUSOLO4K480x320 = 4,
PNG = 5
}; };
// Functions // Functions

6
src/gui/lcd4l_setup.cpp
View File

@@ -66,8 +66,10 @@ const CMenuOptionChooser::keyval LCD4L_SUPPORT_OPTIONS[] =
const CMenuOptionChooser::keyval_ext LCD4L_DISPLAY_TYPE_OPTIONS[] = const CMenuOptionChooser::keyval_ext LCD4L_DISPLAY_TYPE_OPTIONS[] =
{ {
{ CLCD4l::PEARL, NONEXISTANT_LOCALE, "Pearl"}, { CLCD4l::PEARL320x240, NONEXISTANT_LOCALE, "Pearl"},
{ CLCD4l::SAMSUNG, NONEXISTANT_LOCALE, "Samsung"}, { CLCD4l::SAMSUNG800x480, NONEXISTANT_LOCALE, "800x480 Samsung"},
{ CLCD4l::SAMSUNG800x600, NONEXISTANT_LOCALE, "800x600 Samsung"},
{ CLCD4l::SAMSUNG1024x600, NONEXISTANT_LOCALE, "1024x600 Samsung"},
#if defined BOXMODEL_VUSOLO4K #if defined BOXMODEL_VUSOLO4K
{ CLCD4l::VUSOLO4K, NONEXISTANT_LOCALE, "VUSolo4K"}, { CLCD4l::VUSOLO4K, NONEXISTANT_LOCALE, "VUSolo4K"},
#endif #endif