From f303f3e2f409cc28bd0638f28fb33e55cfe8b5b0 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 24 Mar 2020 22:25:05 +0100 Subject: [PATCH] add 1080p60 resolution for edision osmio stb Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/06da497f4de3835ffd40e804e75848023205f21c Author: Markus Volk Date: 2020-03-24 (Tue, 24 Mar 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 3 +++ src/system/settings.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index cd6d79fd3..83e84b723 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -285,6 +285,9 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" }, { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, +#if BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS + { VIDEO_STD_1080P60, NONEXISTANT_LOCALE, "1080p 60Hz" }, +#endif { VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" }, { VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" }, { VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" }, diff --git a/src/system/settings.h b/src/system/settings.h index ba14b4eab..402743d58 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -49,7 +49,7 @@ #ifdef BOXMODEL_CS_HD2 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16 #elif HAVE_ARM_HARDWARE -#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 17 +#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 18 #else #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 13 #endif