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

lcd4linux: prepare for some more Samsung SPF types

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef1c0352f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-03 (Thu, 03 Jan 2019)

Origin message was:
------------------
- lcd4linux: prepare for some more Samsung SPF types

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-01-03 21:55:33 +01:00
parent cd6dc53650
commit ef9c612400
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/lcd4l.cpp
View File

@@ -197,10 +197,12 @@ int CLCD4l::GetMaxBrightness()
switch (g_settings.lcd4l_display_type) switch (g_settings.lcd4l_display_type)
{ {
case SAMSUNG: case SAMSUNG800x480:
case SAMSUNG800x600:
case SAMSUNG1024x600:
max_brightness = 10; max_brightness = 10;
break; break;
case PEARL: case PEARL320x240:
default: default:
max_brightness = 7; max_brightness = 7;
break; break;
@@ -736,10 +738,19 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
switch (g_settings.lcd4l_display_type) switch (g_settings.lcd4l_display_type)
{ {
case SAMSUNG: case SAMSUNG800x480:
//DisplayType = "Samsung800x480_";
DisplayType = "Samsung_"; DisplayType = "Samsung_";
break; break;
case PEARL: case SAMSUNG800x600:
//DisplayType = "Samsung800x600_";
DisplayType = "Samsung_";
break;
case SAMSUNG1024x600:
//DisplayType = "Samsung1024x600_";
DisplayType = "Samsung_";
break;
case PEARL320x240:
default: default:
DisplayType = "Pearl_"; DisplayType = "Pearl_";
break; break;
@@ -1006,6 +1017,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");
@@ -1026,7 +1039,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");
} }

6
src/driver/lcd4l.h
View File

@@ -41,8 +41,10 @@ class CLCD4l
// Displays // Displays
enum enum
{ {
PEARL = 0, PEARL320x240 = 0,
SAMSUNG = 1 SAMSUNG800x480 = 1,
SAMSUNG800x600 = 2,
SAMSUNG1024x600 = 3
}; };
// Functions // Functions

6
src/gui/lcd4l_setup.cpp
View File

@@ -65,8 +65,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"}
}; };
#define LCD4L_DISPLAY_TYPE_OPTION_COUNT (sizeof(LCD4L_DISPLAY_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext)) #define LCD4L_DISPLAY_TYPE_OPTION_COUNT (sizeof(LCD4L_DISPLAY_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))