- vusolo4k: simplify and unify code from commit af87ebc788

Signed-off-by: Thilo Graf <dbt@novatux.de>

acinclude.m4

@@ -418,10 +418,6 @@ AC_ARG_WITH(boxtype,
 		tripledragon|coolstream|spark|azbox|generic|armbox)
 			BOXTYPE="$withval"
 		;;
-		vusolo4k)
-			BOXTYPE="armbox"
-			BOXMODEL="$withval"
-		;;
 		*)
 			AC_MSG_ERROR([bad value $withval for --with-boxtype])
 		;;
@@ -452,14 +448,7 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		vusolo4k)
-			if test "$BOXTYPE" = "armbox"; then
-				BOXMODEL="$withval"
-			else
-				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
-			fi
-		;;
-		hd51|hd60)
+		hd51|hd60|vusolo4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else

data/y-web/Y_Blocks.txt

@@ -524,7 +524,7 @@ start-block~remote
 		{=if-equal:{=var-get:boxtype=}~CST Trinity Duo~	{=include-block:Y_Blocks.txt;rc_cst_v6=}~
 		{=if-equal:{=var-get:boxtype=}~AX-Technologies HD51~{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
 		{=if-equal:{=var-get:boxtype=}~Mutant HD51~	{=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
-		{=if-equal:{=var-get:boxtype=}~VU SOLO4K~	{=include-block:Y_Blocks.txt;rc_vusolo4k=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~	{=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
 
 		{=comment:fallback~=}				{=include-block:Y_Blocks.txt;rc_cst_v1=}
 		=}=}=}=}=}=}=}=}=}=}=}
@@ -542,7 +542,7 @@ start-block~remote
 	{=if-equal:{=var-get:yfbtype=}~8~	{=include-block:Y_Blocks.txt;rc_cst_v6=}~
 	{=if-equal:{=var-get:yfbtype=}~9~	{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
 	{=if-equal:{=var-get:yfbtype=}~10~	{=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
-	{=if-equal:{=var-get:yfbtype=}~11~	{=include-block:Y_Blocks.txt;rc_vusolo4k=}~
+	{=if-equal:{=var-get:yfbtype=}~11~	{=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
 
 	{=comment:fallback~=}			{=include-block:Y_Blocks.txt;rc_cst_v1=}
 	=}=}=}=}=}=}=}=}=}=}=}=}=}
@@ -1054,9 +1054,9 @@ start-block~rc_mutant_hd51
 </map>
 end-block~rc_mutant_hd51
 
-# ------ Remote VU Solo 4K
-start-block~rc_vusolo4k
-<img src="images/rc_vusolo4k.png" usemap="#rc"/>
+# ------ Remote VU+ Solo 4K
+start-block~rc_vu_solo4k
+<img src="images/rc_vu_solo4k.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <!--<area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV');">-->
 <area shape="circle" coords="105,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER');">
@@ -1105,4 +1105,4 @@ start-block~rc_vusolo4k
 <area shape="circle" coords="81,422,10" id ="128" alt="stop" href="javascript:rcsim('KEY_STOP');">
 <area shape="circle" coords="104,422,10" id ="385" alt="radio" href="javascript:rcsim('KEY_RADIO');">
 </map>
-end-block~rc_vusolo4k
+end-block~rc_vu_solo4k

data/y-web/Y_Settings_yWeb.yhtm

@@ -132,7 +132,7 @@ select {
 						<option value="8">CST HD-2 | Trinity Duo</option>
 						<option value="9">AX | HD51</option>
 						<option value="10">Mutant | HD51</option>
-						<option value="11">VU | Solo 4K</option>
+						<option value="11">VU+ | Solo 4K</option>
 					</select>
 				</td>
 			</tr>

data/y-web/images/Makefile.am

@@ -97,7 +97,7 @@ install_DATA += rc_ax_hd51.png \
 endif
 
 if BOXMODEL_VUSOLO4K
-install_DATA += rc_vusolo4k.png
+install_DATA += rc_vu_solo4k.png
 endif
 
 # file manager

src/driver/rcinput.h

@@ -223,7 +223,7 @@ class CRCInput
 			RC_tv		= KEY_TV,
 			RC_radio	= KEY_RADIO,
 			RC_text		= KEY_TEXT,
-#if defined BOXMODEL_VUSOLO4K
+#if BOXMODEL_VUSOLO4K
 			RC_info		= 0xFFFE,
 			RC_epg		= KEY_INFO,
 #else

src/zapit/include/zapit/femanager.h

@@ -31,7 +31,7 @@
 
 #include <OpenThreads/ReentrantMutex>
 
-#ifdef BOXMODEL_VUSOLO4K
+#if BOXMODEL_VUSOLO4K
 #define MAX_FE          16
 #define MAX_ADAPTERS    4
 #else

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 defined BOXMODEL_VUSOLO4K
+#if BOXMODEL_VUSOLO4K
 			pilot = PILOT_AUTO;
 #else
 			pilot = PILOT_ON;