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

set default volume to 75%

Browse Source 
Conflicts:
	src/neutrino.cpp
This commit is contained in:
TangoCash
2020-10-12 10:58:56 +02:00
committed by Thilo Graf
parent 04108628b2
commit 3cc2f8b208
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neutrino.cpp
View File

@@ -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_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);
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.current_volume_step = configfile.getInt32("current_volume_step", 2);
g_settings.start_volume = configfile.getInt32("start_volume", -1); g_settings.start_volume = configfile.getInt32("start_volume", -1);
if (g_settings.start_volume >= 0) 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_ac3 = configfile.getInt32("audio_volume_percent_ac3", 100);
g_settings.audio_volume_percent_pcm = configfile.getInt32("audio_volume_percent_pcm", 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; ZapStart_arg.ci_delay = g_settings.ci_delay;
memcpy(ZapStart_arg.ci_rpr, g_settings.ci_rpr, sizeof(g_settings.ci_rpr)); memcpy(ZapStart_arg.ci_rpr, g_settings.ci_rpr, sizeof(g_settings.ci_rpr));
#endif #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.webtv_xml = &g_settings.webtv_xml;
ZapStart_arg.webradio_xml = &g_settings.webradio_xml; ZapStart_arg.webradio_xml = &g_settings.webradio_xml;