neutrino: move hdmi_cec code blocks

Origin commit data
------------------
Commit: f996a9838d
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-07-14 (Thu, 14 Jul 2022)

Origin message was:
------------------
- neutrino: move hdmi_cec code blocks
This commit is contained in:
vanhofen
2022-07-14 22:52:35 +02:00
parent 267f970ca2
commit 827b283882
2 changed files with 18 additions and 18 deletions

View File

@@ -466,12 +466,6 @@ int CNeutrinoApp::loadSetup(const char *fname)
g_settings.video_Format = configfile.getInt32("video_Format", DISPLAY_AR_16_9);
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
g_settings.psi_brightness = configfile.getInt32("video_psi_brightness", 128);
g_settings.psi_contrast = configfile.getInt32("video_psi_contrast", 128);
@@ -480,6 +474,12 @@ int CNeutrinoApp::loadSetup(const char *fname)
g_settings.psi_tint = configfile.getInt32("video_psi_tint", 128);
#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
g_settings.current_volume = configfile.getInt32("current_volume", 75);
g_settings.current_volume_step = configfile.getInt32("current_volume_step", 5);
@@ -1557,12 +1557,6 @@ void CNeutrinoApp::saveSetup(const char *fname)
configfile.setInt32("video_Format", g_settings.video_Format);
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
configfile.setInt32("video_psi_brightness", g_settings.psi_brightness);
configfile.setInt32("video_psi_contrast", g_settings.psi_contrast);
@@ -1571,6 +1565,12 @@ void CNeutrinoApp::saveSetup(const char *fname)
configfile.setInt32("video_psi_tint", g_settings.psi_tint);
#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
configfile.setInt32( "current_volume", g_settings.current_volume );
configfile.setInt32("current_volume_step", g_settings.current_volume_step);

View File

@@ -359,12 +359,6 @@ struct SNeutrinoSettings
int video_Format;
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
int psi_brightness;
int psi_contrast;
@@ -373,6 +367,12 @@ struct SNeutrinoSettings
int psi_tint;
#endif
// hdmi cec
int hdmi_cec_mode;
int hdmi_cec_view_on;
int hdmi_cec_standby;
int hdmi_cec_volume;
// volume
char current_volume;
int current_volume_step;