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

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-13 21:41:04 +01:00
parent 5ae7e351ae 168e359e2a
commit 315955cc0d
19 changed files with 432 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/system/settings.h
View File

@@ -625,14 +625,23 @@ struct SNeutrinoSettings
int screen_StartY;
int screen_EndX;
int screen_EndY;
int screen_StartX_crt;
int screen_StartY_crt;
int screen_EndX_crt;
int screen_EndY_crt;
int screen_StartX_lcd;
int screen_StartY_lcd;
int screen_EndX_lcd;
int screen_EndY_lcd;
int screen_StartX_crt_0;
int screen_StartY_crt_0;
int screen_EndX_crt_0;
int screen_EndY_crt_0;
int screen_StartX_lcd_0;
int screen_StartY_lcd_0;
int screen_EndX_lcd_0;
int screen_EndY_lcd_0;
int screen_StartX_crt_1;
int screen_StartY_crt_1;
int screen_EndX_crt_1;
int screen_EndY_crt_1;
int screen_StartX_lcd_1;
int screen_StartY_lcd_1;
int screen_EndX_lcd_1;
int screen_EndY_lcd_1;
int osd_resolution;
int screen_preset;
int screen_width;
int screen_height;