mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/pu/fb-modules'

Browse Source 
only compile tested ;-)
This commit is contained in:
Stefan Seyfried
2017-02-12 21:29:10 +01:00
parent c266891a71 987dbe7f1d
commit 2819e651c3
45 changed files with 859 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/settings.h
View File

@@ -46,7 +46,7 @@
#include <string>
#include <list>
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16
#else
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 13
@@ -177,7 +177,7 @@ struct SNeutrinoSettings
int analog_mode1;
int analog_mode2;
int video_43mode;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
int brightness;
int contrast;
int saturation;
@@ -623,8 +623,6 @@ struct SNeutrinoSettings
int screen_preset;
int screen_width;
int screen_height;
int screen_xres;
int screen_yres;
//Software-update
int softupdate_mode;
@@ -782,9 +780,13 @@ struct SNeutrinoSettings
int zap_cycle;
int sms_channel;
int sms_movie;
std::string font_file;
std::string ttx_font_file;
int font_scaling_x;
int font_scaling_y;
int livestreamResolution;
std::string livestreamScriptPath;