From 36a8b78085d4a33a1df53fa84cc8bb28deada375 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 17 Feb 2022 22:30:19 +0100
Subject: [PATCH] lcd4l: prepare to simplify lcd4linux.conf

Based upon
https://github.com/TangoCash/neutrino-tangos/commit/84fc9cea29ab0f1edb571682eb8d6f2bd80b7932
and
https://github.com/TangoCash/neutrino-tangos/commit/3d6eb88716b2027f67076d206b41a268b9e62856
but in a much simple way.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/7d695d4fea85ead8bda0683ad72c84b34c29f3eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-02-17 (Thu, 17 Feb 2022)

Origin message was:
------------------
- lcd4l: prepare to simplify lcd4linux.conf

Based upon
https://github.com/TangoCash/neutrino-tangos/commit/84fc9cea29ab0f1edb571682eb8d6f2bd80b7932
and
https://github.com/TangoCash/neutrino-tangos/commit/3d6eb88716b2027f67076d206b41a268b9e62856
but in a much simple way.


------------------
This commit was generated by Migit
---
 src/driver/lcd4l.cpp | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp
index 31d2dc3e2..767f12274 100644
--- a/src/driver/lcd4l.cpp
+++ b/src/driver/lcd4l.cpp
@@ -859,60 +859,75 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
 
 		/* --- */
 
-		std::string DisplayType;
+		std::string DisplayDriver;
+		std::string DisplayRes;
 
 		switch (g_settings.lcd4l_display_type)
 		{
 			case SPF800x480:
-				DisplayType = "Samsung800x480_";
+				DisplayDriver = "Samsung";
+				DisplayRes = "800x480";
 				break;
 			case SPF800x600:
-				DisplayType = "Samsung800x600_";
+				DisplayDriver = "Samsung";
+				DisplayRes = "800x600";
 				break;
 			case SPF1024x600:
-				DisplayType = "Samsung1024x600_";
+				DisplayDriver = "Samsung";
+				DisplayRes = "1024x600";
 				break;
 			case DPF320x240:
 			default:
-				DisplayType = "Pearl_";
+				DisplayDriver = "Pearl";
+				DisplayRes = "320x240";
 				break;
 		}
 
-		std::string Layout;
+		std::string DisplayType = DisplayDriver + DisplayRes;
+		// Workaround for DPF
+		if (g_settings.lcd4l_display_type == DPF320x240)
+			DisplayType = DisplayDriver;
+
+		std::string DisplayMode;
 
 		if (ModeStandby)
 		{
-			Layout = DisplayType + "standby";
+			DisplayMode = "standby";
 		}
 		else if ((g_settings.lcd4l_skin_radio) && (m_Mode == NeutrinoModes::mode_radio || m_Mode == NeutrinoModes::mode_webradio))
 		{
-			Layout = DisplayType + "radio";
+			DisplayMode = "radio";
 		}
 		else
 		{
 			switch (g_settings.lcd4l_skin)
 			{
 				case 100:
-					Layout = DisplayType + "user";
+					DisplayMode = "user";
 					break;
 				case 4:
-					Layout = DisplayType + "xcam";
+					DisplayMode = "xcam";
 					break;
 				case 3:
-					Layout = DisplayType + "d-box2";
+					DisplayMode = "d-box2";
 					break;
 				case 2:
-					Layout = DisplayType + "small";
+					DisplayMode = "small";
 					break;
 				case 1:
-					Layout = DisplayType + "large";
+					DisplayMode = "large";
 					break;
 				case 0:
 				default:
-					Layout = DisplayType + "standard";
+					DisplayMode = "standard";
 			}
 		}
 
+		std::string Layout = DisplayType + "_" + DisplayMode;
+		Layout += "\n" + DisplayDriver;
+		Layout += "\n" + DisplayRes;
+		Layout += "\n" + DisplayMode;
+
 		if (m_Layout.compare(Layout))
 		{
 			WriteFile(LAYOUT, Layout);