diff options
author | William Wilgus <me.theuser@yahoo.com> | 2019-07-25 08:03:18 -0500 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2019-07-25 08:03:18 -0500 |
commit | b5b43a0fef087afdc3d7a69a3f62fb7dcbfe4e77 (patch) | |
tree | 672ee07e7dbdd5d36a9b899f8f247478ff3b839a | |
parent | 5f9d1f59d308e5832432d6f3d4e7380ef656521b (diff) | |
download | rockbox-b5b43a0fef087afdc3d7a69a3f62fb7dcbfe4e77.tar.gz rockbox-b5b43a0fef087afdc3d7a69a3f62fb7dcbfe4e77.zip |
Fix Red -- sound_current
Remove dependency on settings.g for bootloader
ifdef out AUDIOHW_HAVE_EQ Settings these should be indexing the
global_settings.hw_eq_bands[AUDIOHW_EQ_BAND_NUM] struct
Change-Id: I1d1a8556ef88ce43397b600261696dacdf372034
-rw-r--r-- | firmware/sound.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index 9db30524d6..51b7c08e13 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -25,7 +25,10 @@ | |||
25 | #include "config.h" | 25 | #include "config.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "sound.h" | 27 | #include "sound.h" |
28 | |||
29 | #ifndef BOOTLOADER | ||
28 | #include "settings.h" /* sound_current */ | 30 | #include "settings.h" /* sound_current */ |
31 | #endif | ||
29 | 32 | ||
30 | #ifdef HAVE_SW_VOLUME_CONTROL | 33 | #ifdef HAVE_SW_VOLUME_CONTROL |
31 | #include "pcm_sw_volume.h" | 34 | #include "pcm_sw_volume.h" |
@@ -112,6 +115,7 @@ int sound_current(int setting) | |||
112 | { | 115 | { |
113 | switch(setting) | 116 | switch(setting) |
114 | { | 117 | { |
118 | #ifndef BOOTLOADER | ||
115 | #ifndef PLATFORM_HAS_VOLUME_CHANGE | 119 | #ifndef PLATFORM_HAS_VOLUME_CHANGE |
116 | SOUND_CUR_SET(VOLUME, global_settings.volume) | 120 | SOUND_CUR_SET(VOLUME, global_settings.volume) |
117 | #endif | 121 | #endif |
@@ -144,8 +148,10 @@ int sound_current(int setting) | |||
144 | SOUND_CUR_SET(DEPTH_3D, global_settings.depth_3d) | 148 | SOUND_CUR_SET(DEPTH_3D, global_settings.depth_3d) |
145 | #endif | 149 | #endif |
146 | #if defined(AUDIOHW_HAVE_FILTER_ROLL_OFF) | 150 | #if defined(AUDIOHW_HAVE_FILTER_ROLL_OFF) |
147 | SOUND_CUR_SET(FILTER_ROLL_OFF, global_settings.filter_roll_off) | 151 | SOUND_CUR_SET(FILTER_ROLL_OFF, global_settings.roll_off) |
148 | #endif | 152 | #endif |
153 | |||
154 | #if 0 /*WRONG -- these need to index the hw_eq_bands[AUDIOHW_EQ_BAND_NUM] struct*/ | ||
149 | /* Hardware EQ tone controls */ | 155 | /* Hardware EQ tone controls */ |
150 | #if defined(AUDIOHW_HAVE_EQ) | 156 | #if defined(AUDIOHW_HAVE_EQ) |
151 | SOUND_CUR_SET(EQ_BAND1_GAIN, global_settings.hw_eq_band1_gain) | 157 | SOUND_CUR_SET(EQ_BAND1_GAIN, global_settings.hw_eq_band1_gain) |
@@ -184,8 +190,12 @@ int sound_current(int setting) | |||
184 | #if defined(AUDIOHW_HAVE_EQ_BAND5_FREQUENCY) | 190 | #if defined(AUDIOHW_HAVE_EQ_BAND5_FREQUENCY) |
185 | SOUND_CUR_SET(EQ_BAND5_FREQUENCY, global_settings.hw_eq_band5_frequency) | 191 | SOUND_CUR_SET(EQ_BAND5_FREQUENCY, global_settings.hw_eq_band5_frequency) |
186 | #endif | 192 | #endif |
193 | |||
187 | #endif /* AUDIOHW_HAVE_EQ_BAND5 */ | 194 | #endif /* AUDIOHW_HAVE_EQ_BAND5 */ |
188 | #endif /* AUDIOHW_HAVE_EQ */ | 195 | #endif /* AUDIOHW_HAVE_EQ */ |
196 | #endif /*IF 0*/ | ||
197 | |||
198 | #endif /*ndef BOOTLOADER*/ | ||
189 | default: | 199 | default: |
190 | return INT_MIN; | 200 | return INT_MIN; |
191 | } /* switch(setting) */ | 201 | } /* switch(setting) */ |