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

- neutrino: move hdmi_cec code blocks

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-07-14 22:52:35 +02:00
committed by Thilo Graf
parent c29a679783
commit 42355a336f
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/neutrino.cpp
View File

@@ -462,12 +462,6 @@ int CNeutrinoApp::loadSetup(const char *fname)
g_settings.video_Format = configfile.getInt32("video_Format", DISPLAY_AR_16_9); g_settings.video_Format = configfile.getInt32("video_Format", DISPLAY_AR_16_9);
g_settings.video_43mode = configfile.getInt32("video_43mode", DISPLAY_AR_MODE_LETTERBOX); g_settings.video_43mode = configfile.getInt32("video_43mode", DISPLAY_AR_MODE_LETTERBOX);
// hdmi cec
g_settings.hdmi_cec_mode = configfile.getInt32("hdmi_cec_mode", 0);
g_settings.hdmi_cec_view_on = configfile.getInt32("hdmi_cec_view_on", 0);
g_settings.hdmi_cec_standby = configfile.getInt32("hdmi_cec_standby", 0);
g_settings.hdmi_cec_volume = configfile.getInt32("hdmi_cec_volume", 0);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_settings.psi_brightness = configfile.getInt32("video_psi_brightness", 128); g_settings.psi_brightness = configfile.getInt32("video_psi_brightness", 128);
g_settings.psi_contrast = configfile.getInt32("video_psi_contrast", 128); g_settings.psi_contrast = configfile.getInt32("video_psi_contrast", 128);
@@ -476,6 +470,12 @@ int CNeutrinoApp::loadSetup(const char *fname)
g_settings.psi_tint = configfile.getInt32("video_psi_tint", 128); g_settings.psi_tint = configfile.getInt32("video_psi_tint", 128);
#endif #endif
// hdmi cec
g_settings.hdmi_cec_mode = configfile.getInt32("hdmi_cec_mode", 0);
g_settings.hdmi_cec_view_on = configfile.getInt32("hdmi_cec_view_on", 0);
g_settings.hdmi_cec_standby = configfile.getInt32("hdmi_cec_standby", 0);
g_settings.hdmi_cec_volume = configfile.getInt32("hdmi_cec_volume", 0);
// volume // volume
g_settings.current_volume = configfile.getInt32("current_volume", 75); g_settings.current_volume = configfile.getInt32("current_volume", 75);
g_settings.current_volume_step = configfile.getInt32("current_volume_step", 5); g_settings.current_volume_step = configfile.getInt32("current_volume_step", 5);
@@ -1555,12 +1555,6 @@ void CNeutrinoApp::saveSetup(const char *fname)
configfile.setInt32("video_Format", g_settings.video_Format); configfile.setInt32("video_Format", g_settings.video_Format);
configfile.setInt32("video_43mode", g_settings.video_43mode); configfile.setInt32("video_43mode", g_settings.video_43mode);
// hdmi cec
configfile.setInt32("hdmi_cec_mode", g_settings.hdmi_cec_mode);
configfile.setInt32("hdmi_cec_view_on", g_settings.hdmi_cec_view_on);
configfile.setInt32("hdmi_cec_standby", g_settings.hdmi_cec_standby);
configfile.setInt32("hdmi_cec_volume", g_settings.hdmi_cec_volume);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
configfile.setInt32("video_psi_brightness", g_settings.psi_brightness); configfile.setInt32("video_psi_brightness", g_settings.psi_brightness);
configfile.setInt32("video_psi_contrast", g_settings.psi_contrast); configfile.setInt32("video_psi_contrast", g_settings.psi_contrast);
@@ -1569,6 +1563,12 @@ void CNeutrinoApp::saveSetup(const char *fname)
configfile.setInt32("video_psi_tint", g_settings.psi_tint); configfile.setInt32("video_psi_tint", g_settings.psi_tint);
#endif #endif
// hdmi cec
configfile.setInt32("hdmi_cec_mode", g_settings.hdmi_cec_mode);
configfile.setInt32("hdmi_cec_view_on", g_settings.hdmi_cec_view_on);
configfile.setInt32("hdmi_cec_standby", g_settings.hdmi_cec_standby);
configfile.setInt32("hdmi_cec_volume", g_settings.hdmi_cec_volume);
// volume // volume
configfile.setInt32( "current_volume", g_settings.current_volume ); configfile.setInt32( "current_volume", g_settings.current_volume );
configfile.setInt32("current_volume_step", g_settings.current_volume_step); configfile.setInt32("current_volume_step", g_settings.current_volume_step);

12
src/system/settings.h
View File

@@ -362,12 +362,6 @@ struct SNeutrinoSettings
int video_Format; int video_Format;
int video_43mode; int video_43mode;
// hdmi cec
int hdmi_cec_mode;
int hdmi_cec_view_on;
int hdmi_cec_standby;
int hdmi_cec_volume;
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
int psi_brightness; int psi_brightness;
int psi_contrast; int psi_contrast;
@@ -376,6 +370,12 @@ struct SNeutrinoSettings
int psi_tint; int psi_tint;
#endif #endif
// hdmi cec
int hdmi_cec_mode;
int hdmi_cec_view_on;
int hdmi_cec_standby;
int hdmi_cec_volume;
// volume // volume
char current_volume; char current_volume;
int current_volume_step; int current_volume_step;