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

videsettings: fix cst build

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14cf0080da
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2021-12-03 22:27:18 +01:00
parent e0341e88f1
commit d5294f19b7
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/Makefile.am
View File

@@ -159,6 +159,11 @@ libneutrino_gui_a_SOURCES += \
psisetup.cpp psisetup.cpp
endif endif
if BOXTYPE_MIPSBOX
libneutrino_gui_a_SOURCES += \
psisetup.cpp
endif
#NI if ENABLE_TESTING #NI if ENABLE_TESTING
libneutrino_gui_a_SOURCES += \ libneutrino_gui_a_SOURCES += \
test_menu.cpp test_menu.cpp

6
src/gui/videosettings.cpp
View File

@@ -47,7 +47,7 @@
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#include <gui/osd_setup.h> #include <gui/osd_setup.h>
#include <gui/osd_helpers.h> #include <gui/osd_helpers.h>
#if HAVE_ARM_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#include <gui/psisetup.h> #include <gui/psisetup.h>
#endif #endif
@@ -355,6 +355,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO
{ 2, LOCALE_VIDEOMENU_DBDR_BOTH } { 2, LOCALE_VIDEOMENU_DBDR_BOTH }
}; };
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 2 #define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 2
CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_OPTION_COUNT] = 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_BT2020CL, LOCALE_VIDEOMENU_HDMI_MODE_BT2020CL },
{ HDMI_MODE_BT709, LOCALE_VIDEOMENU_HDMI_MODE_BT709 } { HDMI_MODE_BT709, LOCALE_VIDEOMENU_HDMI_MODE_BT709 }
}; };
#endif
int CVideoSettings::showVideoSetup() int CVideoSettings::showVideoSetup()
{ {
@@ -529,6 +531,7 @@ int CVideoSettings::showVideoSetup()
videosetup->addItem(quadpip); videosetup->addItem(quadpip);
#endif #endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (file_exists("/proc/stb/video/zapmode")) { 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); 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); zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE);
@@ -541,7 +544,6 @@ int CVideoSettings::showVideoSetup()
videosetup->addItem(hm); videosetup->addItem(hm);
} }
#if HAVE_ARM_HARDWARE
videosetup->addItem(GenericMenuSeparatorLine); videosetup->addItem(GenericMenuSeparatorLine);
CPSISetup *psiSetup = CPSISetup::getInstance(); CPSISetup *psiSetup = CPSISetup::getInstance();

2
src/system/settings.h
View File

@@ -385,8 +385,10 @@ struct SNeutrinoSettings
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT]; int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
int enabled_auto_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT]; int enabled_auto_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
int zappingmode; int zappingmode;
int hdmimode; int hdmimode;
#endif
int cpufreq; int cpufreq;
int standby_cpufreq; int standby_cpufreq;