From 5f613f49c08d9cde1d2e70188b4d9d1d7d728b9d Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Tue, 10 Mar 2020 00:12:56 +0100
Subject: [PATCH] Revert "osd_helpers.cpp: remove unneeded #ifdef conditions"

This reverts commit d7fdaaa400482a3903ceb78306a7dd4d7500f3c2.
---
 src/gui/osd_helpers.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/gui/osd_helpers.cpp b/src/gui/osd_helpers.cpp
index 1550771c7..cd2c37521 100644
--- a/src/gui/osd_helpers.cpp
+++ b/src/gui/osd_helpers.cpp
@@ -144,16 +144,27 @@ int COsdHelpers::isVideoSystem1080(int res)
 	    (res == VIDEO_STD_1080I50) ||
 	    (res == VIDEO_STD_1080P30) ||
 	    (res == VIDEO_STD_1080P24) ||
-	    (res == VIDEO_STD_1080P25) ||
-	    (res == VIDEO_STD_1080P50) ||
+	    (res == VIDEO_STD_1080P25))
+		return true;
+
+#ifdef BOXMODEL_CS_HD2
+	if ((res == VIDEO_STD_1080P50) ||
 	    (res == VIDEO_STD_1080P60) ||
 	    (res == VIDEO_STD_1080P2397) ||
-	    (res == VIDEO_STD_1080P2997) ||
+	    (res == VIDEO_STD_1080P2997))
+		return true;
+#endif
+
+#if HAVE_ARM_HARDWARE
+	if ((res == VIDEO_STD_1080P50) ||
+	    (res == VIDEO_STD_1080P60) ||
 	    (res == VIDEO_STD_2160P24) ||
 	    (res == VIDEO_STD_2160P25) ||
 	    (res == VIDEO_STD_2160P30) ||
 	    (res == VIDEO_STD_2160P50))
 		return true;
+#endif
+
 #if 0
 	/* for testing only */
 	if (res == VIDEO_STD_720P50)