From d6b6f3362f3da932cdfa653086afdefb363f220a Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sun, 27 Oct 2019 16:24:47 +0100
Subject: [PATCH] - acinclude.m4: add defines to summarize vuplus boxmodels

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 acinclude.m4               | 24 ++++++++++++++++++++++++
 src/driver/rcinput.h       |  2 +-
 src/neutrino.cpp           |  6 +++---
 src/zapit/src/frontend.cpp |  8 ++++----
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d26acfe3e..75097f419 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -599,6 +599,30 @@ elif test "$BOXMODEL" = "raspi"; then
 	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
 fi
 
+# all vuplus BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
+		AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus])
+		vuplus=true
+	;;
+	*)
+		vuplus=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true")
+
+# all vuplus4k BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k])
+		vuplus4k=true
+	;;
+	*)
+		vuplus4k=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
+
 # BOXMODELs that allows to change osd resolution
 case "$BOXMODEL" in
 	hd2|hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
index a469b425d..a9cde7977 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -228,7 +228,7 @@ class CRCInput
 			RC_tv		= KEY_TV,
 			RC_radio	= KEY_RADIO,
 			RC_text		= KEY_TEXT,
-#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
+#if BOXMODEL_VUPLUS
 			RC_info		= KEY_NONEXISTING,
 			RC_epg		= KEY_INFO,
 #else
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 9f5a814b1..dbbd93b79 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4990,9 +4990,9 @@ void CNeutrinoApp::loadKeys(const char * fname)
 
 	g_settings.key_list_start = tconfig->getInt32( "key_list_start", (unsigned int)CRCInput::RC_nokey );
 	g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey );
-#if BOXMODEL_HD51 || BOXMODEL_HD60
+#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K
 	g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
-#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
+#elif BOXMODEL_VUPLUS
 	g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause );
 #else
 	g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause );
@@ -5028,7 +5028,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
 #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
 	g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause );
 	g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
-#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
+#elif BOXMODEL_VUPLUS
 	g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play );
 	g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
 #else
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index 50e2a094e..300ec05e8 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -1225,7 +1225,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 	case FEC_2_3:
 		fec = FEC_2_3;
 		if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
-#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
+#if BOXMODEL_VUPLUS4K
 			pilot = PILOT_AUTO;
 #else
 			pilot = PILOT_ON;
@@ -1234,7 +1234,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 	case FEC_3_4:
 		fec = FEC_3_4;
 		if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
-#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
+#if BOXMODEL_VUPLUS4K
 			pilot = PILOT_AUTO;
 #else
 			pilot = PILOT_ON;
@@ -1246,7 +1246,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 	case FEC_5_6:
 		fec = FEC_5_6;
 		if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
-#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
+#if BOXMODEL_VUPLUS4K
 			pilot = PILOT_AUTO;
 #else
 			pilot = PILOT_ON;
@@ -1264,7 +1264,7 @@ bool CFrontend::buildProperties(const FrontendParameters *feparams, struct dtv_p
 	case FEC_3_5:
 		fec = FEC_3_5;
 		if (feparams->delsys == DVB_S2 && feparams->modulation == PSK_8)
-#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K
+#if BOXMODEL_VUPLUS4K
 			pilot = PILOT_AUTO;
 #else
 			pilot = PILOT_ON;