From 3cc2f8b208d32d198eb80094e3277b6e04c9afef Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 12 Oct 2020 10:58:56 +0200 Subject: [PATCH] set default volume to 75% Conflicts: src/neutrino.cpp --- src/neutrino.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 74d76b3a2..e550ad688 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -427,11 +427,11 @@ 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); - g_settings.current_volume = configfile.getInt32("current_volume", 6); + g_settings.current_volume = configfile.getInt32("current_volume", 75); g_settings.current_volume_step = configfile.getInt32("current_volume_step", 2); g_settings.start_volume = configfile.getInt32("start_volume", -1); if (g_settings.start_volume >= 0) - g_settings.current_volume = g_settings.start_volume; + g_settings.current_volume = g_settings.hdmi_cec_volume ? 75 : g_settings.start_volume; g_settings.audio_volume_percent_ac3 = configfile.getInt32("audio_volume_percent_ac3", 100); g_settings.audio_volume_percent_pcm = configfile.getInt32("audio_volume_percent_pcm", 100); @@ -2749,7 +2749,7 @@ TIMER_START(); ZapStart_arg.ci_delay = g_settings.ci_delay; memcpy(ZapStart_arg.ci_rpr, g_settings.ci_rpr, sizeof(g_settings.ci_rpr)); #endif - ZapStart_arg.volume = g_settings.hdmi_cec_volume ? 85 : g_settings.current_volume; + ZapStart_arg.volume = g_settings.hdmi_cec_volume ? 100 : g_settings.current_volume; ZapStart_arg.webtv_xml = &g_settings.webtv_xml; ZapStart_arg.webradio_xml = &g_settings.webradio_xml;