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

lcd4l: rename keywords in display enum

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0170738667
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-02-08 (Tue, 08 Feb 2022)

Origin message was:
------------------
- lcd4l: rename keywords in display enum

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-02-08 23:48:48 +01:00
parent a3dae9a0d7
commit 5c81ea3eb3
4 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/lcd4l.cpp
View File

@@ -256,12 +256,12 @@ int CLCD4l::GetMaxBrightness()
switch (g_settings.lcd4l_display_type)
{
case SAMSUNG800x480:
case SAMSUNG800x600:
case SAMSUNG1024x600:
case SPF800x480:
case SPF800x600:
case SPF1024x600:
max_brightness = 10;
break;
case PEARL320x240:
case DPF320x240:
default:
max_brightness = 7;
break;
@@ -475,7 +475,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
int x_res, y_res, framerate;
if (videoDecoder)
{ // Hack: That should not happen, but while shutting down there
{
// Hack: That should not happen, but while shutting down there
// could be a null pointer and this can lead to a crash.
// This behavior was observed with LeakSanitizer on pc hardware.
videoDecoder->getPictureInfo(x_res, y_res, framerate);
@@ -603,6 +604,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
m_Tuner_ber = Tuner_ber;
}
}
/* ----------------------------------------------------------------- */
int Volume = g_settings.current_volume;
@@ -861,16 +863,16 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
switch (g_settings.lcd4l_display_type)
{
case SAMSUNG800x480:
case SPF800x480:
DisplayType = "Samsung800x480_";
break;
case SAMSUNG800x600:
case SPF800x600:
DisplayType = "Samsung800x600_";
break;
case SAMSUNG1024x600:
case SPF1024x600:
DisplayType = "Samsung1024x600_";
break;
case PEARL320x240:
case DPF320x240:
default:
DisplayType = "Pearl_";
break;
@@ -1233,7 +1235,7 @@ bool CLCD4l::WriteFile(const char *file, std::string content, bool convert)
strReplace(content, "Ä", "\xc4\0");
strReplace(content, "Ö", "\xd6\0");
strReplace(content, "Ü", "\xdc\0");
if (g_settings.lcd4l_display_type == PEARL320x240)
if (g_settings.lcd4l_display_type == DPF320x240)
strReplace(content, "ß", "\xe2\0");
strReplace(content, "Ą", "\x41\0");

8
src/driver/lcd4l.h
View File

@@ -45,10 +45,10 @@ class CLCD4l
// Displays
enum
{
PEARL320x240 = 0,
SAMSUNG800x480 = 1,
SAMSUNG800x600 = 2,
SAMSUNG1024x600 = 3
DPF320x240 = 0,
SPF800x480 = 1,
SPF800x600 = 2,
SPF1024x600 = 3
};
// Functions

24
src/gui/lcd4l_setup.cpp
View File

@@ -62,14 +62,14 @@ const CMenuOptionChooser::keyval LCD4L_SUPPORT_OPTIONS[] =
const CMenuOptionChooser::keyval_ext LCD4L_DISPLAY_TYPE_OPTIONS[] =
{
{ CLCD4l::PEARL320x240, NONEXISTANT_LOCALE, "320x240 Pearl DPF"},
{ CLCD4l::SAMSUNG800x480, NONEXISTANT_LOCALE, "800x480 Samsung SPF"},
{ CLCD4l::SAMSUNG800x600, NONEXISTANT_LOCALE, "800x600 Samsung SPF"},
{ CLCD4l::SAMSUNG1024x600, NONEXISTANT_LOCALE, "1024x600 Samsung SPF"}
{ CLCD4l::DPF320x240, NONEXISTANT_LOCALE, "320x240 Pearl DPF"},
{ CLCD4l::SPF800x480, NONEXISTANT_LOCALE, "800x480 Samsung SPF"},
{ CLCD4l::SPF800x600, NONEXISTANT_LOCALE, "800x600 Samsung SPF"},
{ CLCD4l::SPF1024x600, NONEXISTANT_LOCALE, "1024x600 Samsung SPF"}
};
#define LCD4L_DISPLAY_TYPE_OPTION_COUNT (sizeof(LCD4L_DISPLAY_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))
const CMenuOptionChooser::keyval LCD4L_PEARL_SKIN_OPTIONS[] =
const CMenuOptionChooser::keyval LCD4L_DPF_SKIN_OPTIONS[] =
{
{ 0, LOCALE_LCD4L_SKIN_0 },
{ 1, LOCALE_LCD4L_SKIN_1 },
@@ -78,15 +78,15 @@ const CMenuOptionChooser::keyval LCD4L_PEARL_SKIN_OPTIONS[] =
{ 4, LOCALE_LCD4L_SKIN_4 },
{ 100, LOCALE_LCD4L_SKIN_100 }
};
#define LCD4L_PEARL_SKIN_OPTION_COUNT (sizeof(LCD4L_PEARL_SKIN_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#define LCD4L_DPF_SKIN_OPTION_COUNT (sizeof(LCD4L_DPF_SKIN_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
const CMenuOptionChooser::keyval LCD4L_SAMSUNG_SKIN_OPTIONS[] =
const CMenuOptionChooser::keyval LCD4L_SPF_SKIN_OPTIONS[] =
{
{ 0, LOCALE_LCD4L_SKIN_0 },
{ 4, LOCALE_LCD4L_SKIN_4 },
{ 100, LOCALE_LCD4L_SKIN_100 }
};
#define LCD4L_SAMSUNG_SKIN_OPTION_COUNT (sizeof(LCD4L_SAMSUNG_SKIN_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#define LCD4L_SPF_SKIN_OPTION_COUNT (sizeof(LCD4L_SPF_SKIN_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
using namespace sigc;
@@ -281,7 +281,7 @@ int CLCD4lSetup::show()
int CLCD4lSetup::showTypeSetup()
{
if (temp_lcd4l_display_type == CLCD4l::PEARL320x240)
if (temp_lcd4l_display_type == CLCD4l::DPF320x240)
{
// fix brightness values for Pearl DPF
if (temp_lcd4l_brightness > 7)
@@ -304,10 +304,10 @@ int CLCD4lSetup::showTypeSetup()
CMenuWidget *typeSetup = new CMenuWidget(LOCALE_LCD4L_DISPLAY_TYPE_SETUP, NEUTRINO_ICON_SETTINGS, width);
typeSetup->addIntroItems(); //FIXME: show lcd4l display type
if (temp_lcd4l_display_type == CLCD4l::PEARL320x240)
mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN, &temp_lcd4l_skin, LCD4L_PEARL_SKIN_OPTIONS, LCD4L_PEARL_SKIN_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
if (temp_lcd4l_display_type == CLCD4l::DPF320x240)
mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN, &temp_lcd4l_skin, LCD4L_DPF_SKIN_OPTIONS, LCD4L_DPF_SKIN_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
else
mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN, &temp_lcd4l_skin, LCD4L_SAMSUNG_SKIN_OPTIONS, LCD4L_SAMSUNG_SKIN_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN, &temp_lcd4l_skin, LCD4L_SPF_SKIN_OPTIONS, LCD4L_SPF_SKIN_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SKIN);
typeSetup->addItem(mc);

2
src/neutrino.cpp
View File

@@ -412,7 +412,7 @@ int CNeutrinoApp::loadSetup(const char *fname)
#ifdef ENABLE_LCD4LINUX
g_settings.lcd4l_support = configfile.getInt32("lcd4l_support", 0);
g_settings.lcd4l_logodir = configfile.getString("lcd4l_logodir", "/media/sda1/logos");
g_settings.lcd4l_display_type = configfile.getInt32("lcd4l_display_type", 0);
g_settings.lcd4l_display_type = configfile.getInt32("lcd4l_display_type", CLCD4l::DPF320x240);
g_settings.lcd4l_skin = configfile.getInt32("lcd4l_skin", 0);
g_settings.lcd4l_skin_radio = configfile.getInt32("lcd4l_skin_radio", 0);
g_settings.lcd4l_brightness = configfile.getInt32("lcd4l_brightness", 7);