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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a4a5e1ae6
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 23:29:07 +01:00
parent 55d5e6bf90 5b537a782f
commit e67e33d323
20 changed files with 455 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/system/settings.h
View File

@@ -629,14 +629,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;