summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.c39
-rw-r--r--apps/settings.h1
-rw-r--r--apps/settings_menu.c1
3 files changed, 30 insertions, 11 deletions
diff --git a/apps/settings.c b/apps/settings.c
index e93411a8a2..2667df743b 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -344,6 +344,32 @@ int settings_save( void )
344 return 0; 344 return 0;
345} 345}
346 346
347void settings_apply(void)
348{
349 mpeg_sound_set(SOUND_BASS, global_settings.bass);
350 mpeg_sound_set(SOUND_TREBLE, global_settings.treble);
351 mpeg_sound_set(SOUND_BALANCE, global_settings.balance);
352 mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
353
354#ifdef HAVE_MAS3587F
355 mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness);
356 mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost);
357 mpeg_sound_set(SOUND_AVC, global_settings.avc);
358#endif
359
360 lcd_set_contrast(global_settings.contrast);
361 lcd_scroll_speed(global_settings.scroll_speed);
362 backlight_set_timeout(global_settings.backlight_timeout);
363#ifdef HAVE_CHARGE_CTRL
364 backlight_set_on_when_charging(global_settings.backlight_on_when_charging);
365#endif
366 ata_spindown(global_settings.disk_spindown);
367 set_poweroff_timeout(global_settings.poweroff);
368#ifdef HAVE_CHARGE_CTRL
369 charge_restart_level = global_settings.discharge ? CHARGE_RESTART_LO : CHARGE_RESTART_HI;
370#endif
371}
372
347/* 373/*
348 * load settings from disk or RTC RAM 374 * load settings from disk or RTC RAM
349 */ 375 */
@@ -448,17 +474,8 @@ void settings_load(void)
448 strncpy(global_settings.resume_file, &config_block[0xFC], MAX_PATH); 474 strncpy(global_settings.resume_file, &config_block[0xFC], MAX_PATH);
449 global_settings.resume_file[MAX_PATH]=0; 475 global_settings.resume_file[MAX_PATH]=0;
450 } 476 }
451 lcd_set_contrast(global_settings.contrast); 477
452 lcd_scroll_speed(global_settings.scroll_speed); 478 settings_apply();
453 backlight_set_timeout(global_settings.backlight_timeout);
454#ifdef HAVE_CHARGE_CTRL
455 backlight_set_on_when_charging(global_settings.backlight_on_when_charging);
456#endif
457 ata_spindown(global_settings.disk_spindown);
458 set_poweroff_timeout(global_settings.poweroff);
459#ifdef HAVE_CHARGE_CTRL
460 charge_restart_level = global_settings.discharge ? CHARGE_RESTART_LO : CHARGE_RESTART_HI;
461#endif
462} 479}
463 480
464static int read_line(int fd, char* buffer, int buffer_size) 481static int read_line(int fd, char* buffer, int buffer_size)
diff --git a/apps/settings.h b/apps/settings.h
index 437f0937dd..35c345aaad 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -110,6 +110,7 @@ struct user_settings
110int settings_save(void); 110int settings_save(void);
111void settings_load(void); 111void settings_load(void);
112void settings_reset(void); 112void settings_reset(void);
113void settings_apply(void);
113void settings_display(void); 114void settings_display(void);
114 115
115bool settings_load_eq(char* file); 116bool settings_load_eq(char* file);
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 3b83e18fe4..9b18a11493 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -345,6 +345,7 @@ static bool reset_settings(void)
345 button = button_get(true); 345 button = button_get(true);
346 if (button == BUTTON_PLAY) { 346 if (button == BUTTON_PLAY) {
347 settings_reset(); 347 settings_reset();
348 settings_apply();
348 lcd_clear_display(); 349 lcd_clear_display();
349 lcd_puts(0,0,str(LANG_RESET_DONE_SETTING)); 350 lcd_puts(0,0,str(LANG_RESET_DONE_SETTING));
350 lcd_puts(0,1,str(LANG_RESET_DONE_CLEAR)); 351 lcd_puts(0,1,str(LANG_RESET_DONE_CLEAR));