From d8f0038ef2396adf1f5c035a89cef9d61cb539d2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 13 Feb 2017 23:15:25 +0100 Subject: [PATCH] ni-menu; fix build; OSD-Scart-Fix needs fixes, as it seems Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/477ed4a017e027a8e9131a51632fbb626b5e4f9c Author: vanhofen Date: 2017-02-13 (Mon, 13 Feb 2017) Origin message was: ------------------ - ni-menu; fix build; OSD-Scart-Fix needs fixes, as it seems ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/ni_menu.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gui/ni_menu.cpp b/src/gui/ni_menu.cpp index 5226862f4..494fa0568 100644 --- a/src/gui/ni_menu.cpp +++ b/src/gui/ni_menu.cpp @@ -218,17 +218,17 @@ bool CNITouchFileNotifier::changeNotify(const neutrino_locale_t, void * data) if (strstr(filename, "scart_osd_fix")) { //change to scart-osd-fix values - g_settings.screen_StartX_crt = 29; - g_settings.screen_StartY_crt = 43; - g_settings.screen_EndX_crt = 693; - g_settings.screen_EndY_crt = 535; + g_settings.screen_StartX_crt_0 = 29; + g_settings.screen_StartY_crt_0 = 43; + g_settings.screen_EndX_crt_0 = 693; + g_settings.screen_EndY_crt_0 = 535; g_settings.screen_preset = 0; //set values - g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd : g_settings.screen_StartX_crt; - g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd : g_settings.screen_StartY_crt; - g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_lcd : g_settings.screen_EndX_crt; - g_settings.screen_EndY = g_settings.screen_preset ? g_settings.screen_EndY_lcd : g_settings.screen_EndY_crt; + g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd_0 : g_settings.screen_StartX_crt_0; + g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd_0 : g_settings.screen_StartY_crt_0; + g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_lcd_0 : g_settings.screen_EndX_crt_0; + g_settings.screen_EndY = g_settings.screen_preset ? g_settings.screen_EndY_lcd_0 : g_settings.screen_EndY_crt_0; CFrameBuffer::getInstance()->Clear(); @@ -273,16 +273,16 @@ bool CNITouchFileNotifier::changeNotify(const neutrino_locale_t, void * data) if (strstr(filename, "scart_osd_fix")) { //reset to defaults - g_settings.screen_StartX_crt = 60; - g_settings.screen_StartY_crt = 20; - g_settings.screen_EndX_crt = 1220; - g_settings.screen_EndY_crt = 560; + g_settings.screen_StartX_crt_0 = 60; + g_settings.screen_StartY_crt_0 = 20; + g_settings.screen_EndX_crt_0 = 1220; + g_settings.screen_EndY_crt_0 = 560; //set values - g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd : g_settings.screen_StartX_crt; - g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd : g_settings.screen_StartY_crt; - g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_lcd : g_settings.screen_EndX_crt; - g_settings.screen_EndY = g_settings.screen_preset ? g_settings.screen_EndY_lcd : g_settings.screen_EndY_crt; + g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd_0 : g_settings.screen_StartX_crt_0; + g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd_0 : g_settings.screen_StartY_crt_0; + g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_lcd_0 : g_settings.screen_EndX_crt_0; + g_settings.screen_EndY = g_settings.screen_preset ? g_settings.screen_EndY_lcd_0 : g_settings.screen_EndY_crt_0; CFrameBuffer::getInstance()->Clear();