mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

vuzero4k and vuduo4k added

Browse Source 
Origin commit data
------------------
Commit: 6b80101df9
Author: max_10 <max_10@gmx.de>
Date: 2019-08-25 (Sun, 25 Aug 2019)

Origin message was:
------------------
- vuzero4k and vuduo4k added
This commit is contained in:
max_10
2019-08-25 22:18:40 +02:00
committed by vanhofen
parent f0661b7a71
commit f34a82459b
8 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acinclude.m4
View File

@@ -446,7 +446,7 @@ AC_ARG_WITH(boxtype,
AC_ARG_WITH(boxmodel,
AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k])
AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuzero4k])
AS_HELP_STRING([], [valid for mipsbox: vuduo])
AS_HELP_STRING([], [valid for generic: raspi]),
[case "${withval}" in
@@ -469,7 +469,7 @@ AS_HELP_STRING([], [valid for generic: raspi]),
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
hd51|hd60|vusolo4k|bre2ze4k)
hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuzero4k)
if test "$BOXTYPE" = "armbox"; then
BOXMODEL="$withval"
else
@@ -511,8 +511,10 @@ AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
@@ -545,11 +547,17 @@ elif test "$BOXMODEL" = "hd51"; then
elif test "$BOXMODEL" = "hd60"; then
AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "bre2ze4k"; then
AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "vusolo4k"; then
AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "bre2ze4k"; then
AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
elif test "$BOXMODEL" = "vuduo4k"; then
AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "vuzero4k"; then
AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
elif test "$BOXMODEL" = "vuduo"; then
AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo])

14
data/y-web/Y_Blocks.txt
View File

@@ -537,9 +537,12 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~Mutant HD51~ {=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
{=if-equal:{=var-get:boxtype=}~WWIO BRE2ZE 4K~ {=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~
{=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=if-equal:{=var-get:boxtype=}~VU+ DUO4K~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=if-equal:{=var-get:boxtype=}~VU+ DUO~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=if-equal:{=var-get:boxtype=}~VU+ ZERO4K~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=}=}=}=}
=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
=}=}
~
{=if-equal:{=var-get:yfbtype=}~-2~ {=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -556,9 +559,12 @@ start-block~remote
{=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_wwio_bre2ze4k=}~
{=if-equal:{=var-get:yfbtype=}~12~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=if-equal:{=var-get:yfbtype=}~13~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=if-equal:{=var-get:yfbtype=}~14~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=if-equal:{=var-get:yfbtype=}~15~ {=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}=}=}=}=}=}=}=}=}
=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
=}
end-block~remote
@@ -1129,7 +1135,7 @@ start-block~rc_wwio_bre2ze4k
</map>
end-block~rc_wwio_bre2ze4k
# ------ Remote VU+ Solo 4K
# ------ Remote VU+ Solo/Duo/Zero 4K
start-block~rc_vu_solo4k
<img src="images/rc_vu_solo4k.png" usemap="#rc"/>
<map name="rc" id="rc">
@@ -1148,7 +1154,7 @@ start-block~rc_vu_solo4k
<area shape="circle" coords="102,106,10" id ="7" alt="6" href="javascript:rcsim('KEY_6');">
<area shape="circle" coords="38,133,10" id ="8" alt="7" href="javascript:rcsim('KEY_7');">
<area shape="circle" coords="70,133,10" id ="9" alt="8" href="javascript:rcsim('KEY_8');">
<area shape="circle" coords="102,133,10" id ="10" alt="9" href="javascript:rcsim('9');">
<area shape="circle" coords="102,133,10" id ="10" alt="9" href="javascript:rcsim('KEY_9');">
<area shape="circle" coords="38,161,10" id ="412" alt="previous" href="javascript:rcsim('KEY_PREVIOUS');">
<area shape="circle" coords="70,161,10" id ="11" alt="0" href="javascript:rcsim('KEY_0');">
<area shape="circle" coords="102,161,10" id ="407" alt="next" href="javascript:rcsim('KEY_NEXT');">

12
data/y-web/images/Makefile.am
View File

@@ -104,6 +104,18 @@ if BOXMODEL_VUSOLO4K
install_DATA += rc_vu_solo4k.png
endif
if BOXMODEL_VUDUO4K
install_DATA += rc_vu_solo4k.png
endif
if BOXMODEL_VUZERO4K
install_DATA += rc_vu_solo4k.png
endif
if BOXMODEL_VUDUO
install_DATA += rc_vu_solo4k.png
endif
# file manager
install_DATA += chmod.png \
copy.gif \

2
src/driver/rcinput.h
View File

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

2
src/gui/scan_setup.h
View File

@@ -66,7 +66,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
CGenericMenuActivate msettings;
CMenuOptionChooser * linkfe;
#if BOXMODEL_VUSOLO4K
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K
std::string modestr[16];
#else
std::string modestr[4];

4
src/neutrino.cpp
View File

@@ -5253,7 +5253,7 @@ 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 HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
#else
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause );
@@ -5289,7 +5289,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K
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
#elif BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUZERO4K || BOXMODEL_VUDUO
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_play );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#else

2
src/zapit/include/zapit/femanager.h
View File

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

2
src/zapit/src/frontend.cpp
View File

@@ -1233,7 +1233,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
#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K
pilot = PILOT_AUTO;
#else
pilot = PILOT_ON;