summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 185e2c3576..17e200812e 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -77,14 +77,12 @@
77struct user_settings global_settings; 77struct user_settings global_settings;
78struct system_status global_status; 78struct system_status global_status;
79 79
80#if CONFIG_CODEC == SWCODEC
81#include "dsp_proc_settings.h" 80#include "dsp_proc_settings.h"
82#include "playback.h" 81#include "playback.h"
83#ifdef HAVE_RECORDING 82#ifdef HAVE_RECORDING
84#include "enc_config.h" 83#include "enc_config.h"
85#endif 84#endif
86#include "pcm_sampr.h" 85#include "pcm_sampr.h"
87#endif /* CONFIG_CODEC == SWCODEC */
88 86
89#define NVRAM_DATA_START 8 87#define NVRAM_DATA_START 8
90#ifdef HAVE_RTC_RAM 88#ifdef HAVE_RTC_RAM
@@ -589,12 +587,10 @@ static bool settings_write_config(const char* filename, int options)
589 continue; 587 continue;
590 break; 588 break;
591#endif 589#endif
592#if CONFIG_CODEC == SWCODEC
593 case SETTINGS_SAVE_EQPRESET: 590 case SETTINGS_SAVE_EQPRESET:
594 if ((settings[i].flags&F_EQSETTING) == 0) 591 if ((settings[i].flags&F_EQSETTING) == 0)
595 continue; 592 continue;
596 break; 593 break;
597#endif
598 } 594 }
599 595
600 cfg_to_string(i, value, MAX_PATH); 596 cfg_to_string(i, value, MAX_PATH);
@@ -675,12 +671,10 @@ bool settings_save_config(int options)
675 namebase = "recording"; 671 namebase = "recording";
676 break; 672 break;
677#endif 673#endif
678#if CONFIG_CODEC == SWCODEC
679 case SETTINGS_SAVE_EQPRESET: 674 case SETTINGS_SAVE_EQPRESET:
680 folder = EQS_DIR; 675 folder = EQS_DIR;
681 namebase = "eq"; 676 namebase = "eq";
682 break; 677 break;
683#endif
684 case SETTINGS_SAVE_SOUND: 678 case SETTINGS_SAVE_SOUND:
685 folder = ROCKBOX_DIR; 679 folder = ROCKBOX_DIR;
686 namebase = "sound"; 680 namebase = "sound";
@@ -982,7 +976,6 @@ void settings_apply(bool read_disk)
982 lcd_scroll_delay(global_settings.scroll_delay); 976 lcd_scroll_delay(global_settings.scroll_delay);
983 977
984 978
985#if CONFIG_CODEC == SWCODEC
986#ifdef HAVE_PLAY_FREQ 979#ifdef HAVE_PLAY_FREQ
987 /* before crossfade */ 980 /* before crossfade */
988 audio_set_playback_frequency(global_settings.play_frequency); 981 audio_set_playback_frequency(global_settings.play_frequency);
@@ -1016,7 +1009,6 @@ void settings_apply(bool read_disk)
1016 dsp_timestretch_enable(global_settings.timestretch_enabled); 1009 dsp_timestretch_enable(global_settings.timestretch_enabled);
1017#endif 1010#endif
1018 dsp_set_compressor(&global_settings.compressor_settings); 1011 dsp_set_compressor(&global_settings.compressor_settings);
1019#endif
1020 1012
1021#ifdef HAVE_SPDIF_POWER 1013#ifdef HAVE_SPDIF_POWER
1022 spdif_power_enable(global_settings.spdif_enable); 1014 spdif_power_enable(global_settings.spdif_enable);
@@ -1068,7 +1060,7 @@ void settings_apply(bool read_disk)
1068#endif 1060#endif
1069 1061
1070 /* This should stay last */ 1062 /* This should stay last */
1071#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC 1063#if defined(HAVE_RECORDING)
1072 enc_global_settings_apply(); 1064 enc_global_settings_apply();
1073#endif 1065#endif
1074#ifdef HAVE_LCD_BITMAP 1066#ifdef HAVE_LCD_BITMAP
@@ -1114,7 +1106,7 @@ void settings_reset(void)
1114{ 1106{
1115 for(int i=0; i<nb_settings; i++) 1107 for(int i=0; i<nb_settings; i++)
1116 reset_setting(&settings[i], settings[i].setting); 1108 reset_setting(&settings[i], settings[i].setting);
1117#if defined (HAVE_RECORDING) && CONFIG_CODEC == SWCODEC 1109#if defined (HAVE_RECORDING)
1118 enc_global_settings_reset(); 1110 enc_global_settings_reset();
1119#endif 1111#endif
1120#ifdef HAVE_LCD_BITMAP 1112#ifdef HAVE_LCD_BITMAP