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/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 22:17:17 +01:00
parent 826d527841 b9b5808928
commit afda007d95
46 changed files with 220 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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
@@ -185,7 +185,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;