diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-15 14:58:00 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-15 14:58:00 -0400 |
commit | 5261b19bdfaf64bebfff05556139dbbcf723876f (patch) | |
tree | 4d897f7a5f8c2fa9df3066074c700fe39c2e3e74 | |
parent | 9e71fd16a55bd69f2cf3345b5ab3459b29c1832d (diff) | |
download | rockbox-5261b19bdfaf64bebfff05556139dbbcf723876f.tar.gz rockbox-5261b19bdfaf64bebfff05556139dbbcf723876f.zip |
Still at it for 0c7b787. Might be done now.
Change-Id: Idf45731dc6554954747f6036dc6dfcd4b63981a1
-rw-r--r-- | apps/SOURCES | 3 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8975.c | 2 | ||||
-rw-r--r-- | firmware/export/hosted_codec.h | 2 | ||||
-rw-r--r-- | firmware/export/mas35xx.h | 6 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c | 10 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/codec-jz4740.c | 2 |
7 files changed, 9 insertions, 18 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 6005460a5a..d34d7b8b30 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -159,11 +159,12 @@ radio/radioart.c | |||
159 | #endif | 159 | #endif |
160 | #endif | 160 | #endif |
161 | 161 | ||
162 | fixedpoint.c | ||
163 | |||
162 | #if CONFIG_CODEC == SWCODEC | 164 | #if CONFIG_CODEC == SWCODEC |
163 | #if INPUT_SRC_CAPS != 0 | 165 | #if INPUT_SRC_CAPS != 0 |
164 | audio_path.c | 166 | audio_path.c |
165 | #endif /* INPUT_SRC_CAPS != 0 */ | 167 | #endif /* INPUT_SRC_CAPS != 0 */ |
166 | fixedpoint.c | ||
167 | pcmbuf.c | 168 | pcmbuf.c |
168 | codec_thread.c | 169 | codec_thread.c |
169 | playback.c | 170 | playback.c |
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 387a1a48c4..3f3ac79229 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c | |||
@@ -150,7 +150,7 @@ void audiohw_set_volume(int vol_l, int vol_r) | |||
150 | wmcodec_write(ROUT1VOL, amp_r | ROUT1VOL_ROUT1ZC | ROUT1VOL_OUT1VU); | 150 | wmcodec_write(ROUT1VOL, amp_r | ROUT1VOL_ROUT1ZC | ROUT1VOL_OUT1VU); |
151 | } | 151 | } |
152 | 152 | ||
153 | void audiohw_set_lineout_vol(int vol_l, int vol_r) | 153 | void audiohw_set_lineout_volume(int vol_l, int vol_r) |
154 | { | 154 | { |
155 | int dac_l, amp_l, dac_r, amp_r; | 155 | int dac_l, amp_l, dac_r, amp_r; |
156 | get_volume_params(vol_l, &dac_l, &_l); | 156 | get_volume_params(vol_l, &dac_l, &_l); |
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c index 3b9fef0dbc..4905445aea 100644 --- a/firmware/drivers/audio/wm8975.c +++ b/firmware/drivers/audio/wm8975.c | |||
@@ -178,7 +178,7 @@ void audiohw_set_volume(int vol_l, int vol_r) | |||
178 | wm8975_write(ROUT1VOL, ROUT1VOL_RO1VU | ROUT1VOL_RO1ZC | vol_r); | 178 | wm8975_write(ROUT1VOL, ROUT1VOL_RO1VU | ROUT1VOL_RO1ZC | vol_r); |
179 | } | 179 | } |
180 | 180 | ||
181 | void audiohw_set_lineout_vol(int vol_l, int vol_r) | 181 | void audiohw_set_lineout_volume(int vol_l, int vol_r) |
182 | { | 182 | { |
183 | vol_l = vol_tenthdb2hw(vol_l); | 183 | vol_l = vol_tenthdb2hw(vol_l); |
184 | vol_r = vol_tenthdb2hw(vol_r); | 184 | vol_r = vol_tenthdb2hw(vol_r); |
diff --git a/firmware/export/hosted_codec.h b/firmware/export/hosted_codec.h index 62a4d57613..e44da37c8d 100644 --- a/firmware/export/hosted_codec.h +++ b/firmware/export/hosted_codec.h | |||
@@ -46,6 +46,6 @@ AUDIOHW_SETTING(BASS_CUTOFF, "", 0, 1, 1, 4, 1) | |||
46 | #if defined(AUDIOHW_HAVE_TREBLE_CUTOFF) | 46 | #if defined(AUDIOHW_HAVE_TREBLE_CUTOFF) |
47 | AUDIOHW_SETTING(TREBLE_CUTOFF, "", 0, 1, 1, 4, 1) | 47 | AUDIOHW_SETTING(TREBLE_CUTOFF, "", 0, 1, 1, 4, 1) |
48 | #endif | 48 | #endif |
49 | /* CONFIG_PLATFORM & PLATFORM_ANDROID */ | 49 | #endif /* CONFIG_PLATFORM & PLATFORM_ANDROID */ |
50 | 50 | ||
51 | #endif /* HOSTED_CODEC_H */ \ No newline at end of file | 51 | #endif /* HOSTED_CODEC_H */ \ No newline at end of file |
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h index e374a1b903..0c6d21140c 100644 --- a/firmware/export/mas35xx.h +++ b/firmware/export/mas35xx.h | |||
@@ -43,9 +43,9 @@ | |||
43 | #define VOLUME_MAX 180 | 43 | #define VOLUME_MAX 180 |
44 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP) | 44 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP) |
45 | 45 | ||
46 | AUDIOHW_SETTING(SOUND_VOLUME, "dB", 0, 1, -78, 18, -18) | 46 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -78, 18, -18) |
47 | AUDIOHW_SETTING(SOUND_BASS, "dB", 0, 1, -15, 15, 7) | 47 | AUDIOHW_SETTING(BASS, "dB", 0, 1, -15, 15, 7) |
48 | AUDIOHW_SETTING(SOUND_TREBLE, "dB", 0, 1, -15, 15, 7) | 48 | AUDIOHW_SETTING(TREBLE, "dB", 0, 1, -15, 15, 7) |
49 | 49 | ||
50 | /* I2C defines */ | 50 | /* I2C defines */ |
51 | #define MAS_ADR 0x3a | 51 | #define MAS_ADR 0x3a |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c index 16d388f0b9..b4774935b8 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c | |||
@@ -22,16 +22,6 @@ | |||
22 | #include "kernel.h" | 22 | #include "kernel.h" |
23 | #include "sound.h" | 23 | #include "sound.h" |
24 | 24 | ||
25 | const struct sound_settings_info audiohw_settings[] = { | ||
26 | [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25}, | ||
27 | [SOUND_BASS] = {"dB", 1, 15, -60, 90, 0}, | ||
28 | [SOUND_TREBLE] = {"dB", 1, 15, -60, 90, 0}, | ||
29 | [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, | ||
30 | [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, | ||
31 | [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, | ||
32 | }; | ||
33 | |||
34 | |||
35 | void audiohw_init(void) | 25 | void audiohw_init(void) |
36 | { | 26 | { |
37 | } | 27 | } |
diff --git a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c index eae89cf78b..ee15b27fae 100644 --- a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c | |||
@@ -270,7 +270,7 @@ void audiohw_init(void) | |||
270 | i2s_codec_init(); | 270 | i2s_codec_init(); |
271 | } | 271 | } |
272 | 272 | ||
273 | void audiohw_set_master_vol(int vol_l, int vol_r) | 273 | void audiohw_set_volume(int vol_l, int vol_r) |
274 | { | 274 | { |
275 | #ifdef HAVE_SW_VOLUME_CONTROL | 275 | #ifdef HAVE_SW_VOLUME_CONTROL |
276 | /* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */ | 276 | /* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */ |