Origin commit data
------------------
Branch: ni/coolstream
Commit: b79c37da51
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-27 (Mon, 27 Jul 2020)

Origin message was:
------------------
- pick psisetup from https://github.com/maxwiesel/neutrino-max

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-07-27 23:16:44 +02:00
parent c1c7fca73a
commit d312b5052e
10 changed files with 481 additions and 1 deletions

View File

@@ -64,6 +64,9 @@
#include <driver/radiotext.h>
#include <driver/scanepg.h>
#if HAVE_ARM_HARDWARE
#include "gui/psisetup.h"
#endif
#include "gui/adzap.h"
#include "gui/audiomute.h"
#include "gui/audioplayer.h"
@@ -417,6 +420,14 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.hdmi_cec_standby = configfile.getInt32("hdmi_cec_standby", 0); // default off
g_settings.hdmi_cec_volume = configfile.getInt32("hdmi_cec_volume", 0);
#if HAVE_ARM_HARDWARE
g_settings.psi_contrast = configfile.getInt32("video_psi_contrast", 128);
g_settings.psi_saturation = configfile.getInt32("video_psi_saturation", 128);
g_settings.psi_brightness = configfile.getInt32("video_psi_brightness", 128);
g_settings.psi_tint = configfile.getInt32("video_psi_tint", 128);
g_settings.psi_step = configfile.getInt32("video_psi_step", 2);
#endif
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.current_volume = configfile.getInt32("current_volume", 60); //NI
@@ -1463,6 +1474,14 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "hdmi_cec_standby", g_settings.hdmi_cec_standby );
configfile.setInt32( "hdmi_cec_volume", g_settings.hdmi_cec_volume );
#if HAVE_ARM_HARDWARE
configfile.setInt32( "video_psi_contrast", g_settings.psi_contrast );
configfile.setInt32( "video_psi_saturation", g_settings.psi_saturation );
configfile.setInt32( "video_psi_brightness", g_settings.psi_brightness );
configfile.setInt32( "video_psi_tint", g_settings.psi_tint );
configfile.setInt32( "video_psi_step", g_settings.psi_step );
#endif
if (!g_settings.hdmi_cec_volume)
configfile.setInt32( "current_volume", g_settings.current_volume );
configfile.setInt32( "current_volume_step", g_settings.current_volume_step );
@@ -3004,6 +3023,9 @@ TIMER_START();
#endif
//InitZapper();
#if HAVE_ARM_HARDWARE
CPSISetup::getInstance()->blankScreen(false);
#endif
SHTDCNT::getInstance()->init();
LCD4l = new CLCD4l();