From d5294f19b7815cfe8af86137c4ce2d3e91f8e50d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Dec 2021 22:27:18 +0100 Subject: [PATCH] videsettings: fix cst build Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/14cf0080da9a9711b8a743903da5f6629aa63b1d Author: vanhofen Date: 2021-12-03 (Fri, 03 Dec 2021) Origin message was: ------------------ - videsettings: fix cst build ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/Makefile.am | 5 +++++ src/gui/videosettings.cpp | 6 ++++-- src/system/settings.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 898fe4969..fe9476c66 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -159,6 +159,11 @@ libneutrino_gui_a_SOURCES += \ psisetup.cpp endif +if BOXTYPE_MIPSBOX +libneutrino_gui_a_SOURCES += \ + psisetup.cpp +endif + #NI if ENABLE_TESTING libneutrino_gui_a_SOURCES += \ test_menu.cpp diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 33ed9e038..b4b86e419 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -47,7 +47,7 @@ #include #include #include -#if HAVE_ARM_HARDWARE +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #include #endif @@ -355,6 +355,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO { 2, LOCALE_VIDEOMENU_DBDR_BOTH } }; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 2 CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_OPTION_COUNT] = { @@ -370,6 +371,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_HDMI_MODE_OPTIONS[VIDEOMENU_HDMI_MODE { HDMI_MODE_BT2020CL, LOCALE_VIDEOMENU_HDMI_MODE_BT2020CL }, { HDMI_MODE_BT709, LOCALE_VIDEOMENU_HDMI_MODE_BT709 } }; +#endif int CVideoSettings::showVideoSetup() { @@ -529,6 +531,7 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(quadpip); #endif +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if (file_exists("/proc/stb/video/zapmode")) { CMenuOptionChooser * zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this); zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE); @@ -541,7 +544,6 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(hm); } -#if HAVE_ARM_HARDWARE videosetup->addItem(GenericMenuSeparatorLine); CPSISetup *psiSetup = CPSISetup::getInstance(); diff --git a/src/system/settings.h b/src/system/settings.h index 11160a243..a84a6e559 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -385,8 +385,10 @@ struct SNeutrinoSettings int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT]; int enabled_auto_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT]; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE int zappingmode; int hdmimode; +#endif int cpufreq; int standby_cpufreq;