diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/apps/settings.c b/apps/settings.c index 8ff9c7b0b0..df03bdcfcf 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -64,6 +64,7 @@ | |||
64 | #include "keyboard.h" | 64 | #include "keyboard.h" |
65 | #include "version.h" | 65 | #include "version.h" |
66 | #include "rtc.h" | 66 | #include "rtc.h" |
67 | #include "sound.h" | ||
67 | #if CONFIG_HWCODEC == MAS3507D | 68 | #if CONFIG_HWCODEC == MAS3507D |
68 | void dac_line_in(bool enable); | 69 | void dac_line_in(bool enable); |
69 | #endif | 70 | #endif |
@@ -719,21 +720,21 @@ void settings_apply_pm_range(void) | |||
719 | 720 | ||
720 | void sound_settings_apply(void) | 721 | void sound_settings_apply(void) |
721 | { | 722 | { |
722 | mpeg_sound_set(SOUND_BASS, global_settings.bass); | 723 | sound_set(SOUND_BASS, global_settings.bass); |
723 | mpeg_sound_set(SOUND_TREBLE, global_settings.treble); | 724 | sound_set(SOUND_TREBLE, global_settings.treble); |
724 | mpeg_sound_set(SOUND_BALANCE, global_settings.balance); | 725 | sound_set(SOUND_BALANCE, global_settings.balance); |
725 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 726 | sound_set(SOUND_VOLUME, global_settings.volume); |
726 | mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); | 727 | sound_set(SOUND_CHANNELS, global_settings.channel_config); |
727 | mpeg_sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); | 728 | sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); |
728 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 729 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) |
729 | mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); | 730 | sound_set(SOUND_LOUDNESS, global_settings.loudness); |
730 | mpeg_sound_set(SOUND_AVC, global_settings.avc); | 731 | sound_set(SOUND_AVC, global_settings.avc); |
731 | mpeg_sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength); | 732 | sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength); |
732 | mpeg_sound_set(SOUND_MDB_HARMONICS, global_settings.mdb_harmonics); | 733 | sound_set(SOUND_MDB_HARMONICS, global_settings.mdb_harmonics); |
733 | mpeg_sound_set(SOUND_MDB_CENTER, global_settings.mdb_center); | 734 | sound_set(SOUND_MDB_CENTER, global_settings.mdb_center); |
734 | mpeg_sound_set(SOUND_MDB_SHAPE, global_settings.mdb_shape); | 735 | sound_set(SOUND_MDB_SHAPE, global_settings.mdb_shape); |
735 | mpeg_sound_set(SOUND_MDB_ENABLE, global_settings.mdb_enable); | 736 | sound_set(SOUND_MDB_ENABLE, global_settings.mdb_enable); |
736 | mpeg_sound_set(SOUND_SUPERBASS, global_settings.superbass); | 737 | sound_set(SOUND_SUPERBASS, global_settings.superbass); |
737 | #endif | 738 | #endif |
738 | } | 739 | } |
739 | 740 | ||
@@ -1261,20 +1262,20 @@ void settings_reset(void) { | |||
1261 | default_table(hd_bits, sizeof(hd_bits)/sizeof(hd_bits[0])); | 1262 | default_table(hd_bits, sizeof(hd_bits)/sizeof(hd_bits[0])); |
1262 | 1263 | ||
1263 | /* do some special cases not covered by table */ | 1264 | /* do some special cases not covered by table */ |
1264 | global_settings.volume = mpeg_sound_default(SOUND_VOLUME); | 1265 | global_settings.volume = sound_default(SOUND_VOLUME); |
1265 | global_settings.balance = mpeg_sound_default(SOUND_BALANCE); | 1266 | global_settings.balance = sound_default(SOUND_BALANCE); |
1266 | global_settings.bass = mpeg_sound_default(SOUND_BASS); | 1267 | global_settings.bass = sound_default(SOUND_BASS); |
1267 | global_settings.treble = mpeg_sound_default(SOUND_TREBLE); | 1268 | global_settings.treble = sound_default(SOUND_TREBLE); |
1268 | global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS); | 1269 | global_settings.loudness = sound_default(SOUND_LOUDNESS); |
1269 | global_settings.avc = mpeg_sound_default(SOUND_AVC); | 1270 | global_settings.avc = sound_default(SOUND_AVC); |
1270 | global_settings.channel_config = mpeg_sound_default(SOUND_CHANNELS); | 1271 | global_settings.channel_config = sound_default(SOUND_CHANNELS); |
1271 | global_settings.stereo_width = mpeg_sound_default(SOUND_STEREO_WIDTH); | 1272 | global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH); |
1272 | global_settings.mdb_strength = mpeg_sound_default(SOUND_MDB_STRENGTH); | 1273 | global_settings.mdb_strength = sound_default(SOUND_MDB_STRENGTH); |
1273 | global_settings.mdb_harmonics = mpeg_sound_default(SOUND_MDB_HARMONICS); | 1274 | global_settings.mdb_harmonics = sound_default(SOUND_MDB_HARMONICS); |
1274 | global_settings.mdb_center = mpeg_sound_default(SOUND_MDB_CENTER); | 1275 | global_settings.mdb_center = sound_default(SOUND_MDB_CENTER); |
1275 | global_settings.mdb_shape = mpeg_sound_default(SOUND_MDB_SHAPE); | 1276 | global_settings.mdb_shape = sound_default(SOUND_MDB_SHAPE); |
1276 | global_settings.mdb_enable = mpeg_sound_default(SOUND_MDB_ENABLE); | 1277 | global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); |
1277 | global_settings.superbass = mpeg_sound_default(SOUND_SUPERBASS); | 1278 | global_settings.superbass = sound_default(SOUND_SUPERBASS); |
1278 | global_settings.contrast = lcd_default_contrast(); | 1279 | global_settings.contrast = lcd_default_contrast(); |
1279 | global_settings.wps_file[0] = '\0'; | 1280 | global_settings.wps_file[0] = '\0'; |
1280 | global_settings.font_file[0] = '\0'; | 1281 | global_settings.font_file[0] = '\0'; |