summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2008-05-25 21:19:07 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2008-05-25 21:19:07 +0000
commit825d89fe282a6797cef5ef7266c908d2986334d4 (patch)
treefb9d61b727ba643abfedf39359bf7ec71a21ee35
parent43d02f66a0ade99a8de3bd76a9d2533b11c7aa41 (diff)
downloadrockbox-825d89fe282a6797cef5ef7266c908d2986334d4.tar.gz
rockbox-825d89fe282a6797cef5ef7266c908d2986334d4.zip
Accept FS #9021 by James Vasile and apply the fix to the other drivers that have the same issue.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17630 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--firmware/drivers/audio/as3514.c2
-rw-r--r--firmware/drivers/audio/mas35xx.c2
-rw-r--r--firmware/drivers/audio/tsc2100.c2
-rw-r--r--firmware/drivers/audio/uda1380.c2
-rw-r--r--firmware/drivers/audio/wm8758.c2
-rw-r--r--firmware/drivers/audio/wm8975.c2
7 files changed, 11 insertions, 2 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 6b23bad60e..64750e879a 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -391,6 +391,7 @@ John Kaminar
391Joris Goosen 391Joris Goosen
392Mark Ganson 392Mark Ganson
393Davide Gentile 393Davide Gentile
394James Vasile
394 395
395 396
396The libmad team 397The libmad team
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index b801375846..01dc23b963 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -37,7 +37,7 @@ const struct sound_settings_info audiohw_settings[] = {
37 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, 37 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
38 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, 38 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
39 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, 39 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
40#if defined(HAVE_RECORDING) 40#ifdef HAVE_RECORDING
41 [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 39, 23}, 41 [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 39, 23},
42 [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23}, 42 [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23},
43 [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23}, 43 [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23},
diff --git a/firmware/drivers/audio/mas35xx.c b/firmware/drivers/audio/mas35xx.c
index 1a0d2afe45..9d80ac93d1 100644
--- a/firmware/drivers/audio/mas35xx.c
+++ b/firmware/drivers/audio/mas35xx.c
@@ -47,7 +47,7 @@ const struct sound_settings_info audiohw_settings[] = {
47 [SOUND_MDB_ENABLE] = {"", 0, 1, 0, 1, 0}, 47 [SOUND_MDB_ENABLE] = {"", 0, 1, 0, 1, 0},
48 [SOUND_SUPERBASS] = {"", 0, 1, 0, 1, 0}, 48 [SOUND_SUPERBASS] = {"", 0, 1, 0, 1, 0},
49#endif 49#endif
50#if CONFIG_CODEC == MAS3587F 50#if CONFIG_CODEC == MAS3587F && defined(HAVE_RECORDING)
51 [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 15, 8}, 51 [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 15, 8},
52 [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 15, 8}, 52 [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 15, 8},
53 [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2}, 53 [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2},
diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c
index 08306b3823..dfa24cf848 100644
--- a/firmware/drivers/audio/tsc2100.c
+++ b/firmware/drivers/audio/tsc2100.c
@@ -35,10 +35,12 @@ const struct sound_settings_info audiohw_settings[] = {
35 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, 35 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
36 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, 36 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
37 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, 37 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
38#ifdef HAVE_RECORDING
38 [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 39, 23}, 39 [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 39, 23},
39 [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23}, 40 [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 31, 23},
40 [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23}, 41 [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 31, 23},
41#endif 42#endif
43#endif
42}; 44};
43static bool is_muted = false; 45static bool is_muted = false;
44/* convert tenth of dB volume to master volume register value */ 46/* convert tenth of dB volume to master volume register value */
diff --git a/firmware/drivers/audio/uda1380.c b/firmware/drivers/audio/uda1380.c
index 388e59b1d2..a344a248b3 100644
--- a/firmware/drivers/audio/uda1380.c
+++ b/firmware/drivers/audio/uda1380.c
@@ -33,9 +33,11 @@ const struct sound_settings_info audiohw_settings[] = {
33 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, 33 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
34 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, 34 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
35 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, 35 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
36#ifdef HAVE_RECORDING
36 [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, 37 [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0},
37 [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, 38 [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0},
38 [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, 39 [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16},
40#endif
39}; 41};
40 42
41/* convert tenth of dB volume (-840..0) to master volume register value */ 43/* convert tenth of dB volume (-840..0) to master volume register value */
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index 8f452f7a09..b380530e39 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -38,9 +38,11 @@ const struct sound_settings_info audiohw_settings[] = {
38 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, 38 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
39 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, 39 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
40 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, 40 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
41#ifdef HAVE_RECORDING
41 [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, 42 [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0},
42 [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, 43 [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0},
43 [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, 44 [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16},
45#endif
44 [SOUND_BASS_CUTOFF] = {"", 0, 1, 1, 4, 1}, 46 [SOUND_BASS_CUTOFF] = {"", 0, 1, 1, 4, 1},
45 [SOUND_TREBLE_CUTOFF] = {"", 0, 1, 1, 4, 1}, 47 [SOUND_TREBLE_CUTOFF] = {"", 0, 1, 1, 4, 1},
46}; 48};
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index 297aabda78..c207895a97 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -42,9 +42,11 @@ const struct sound_settings_info audiohw_settings[] = {
42 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, 42 [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0},
43 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, 43 [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0},
44 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, 44 [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100},
45#ifdef HAVE_RECORDING
45 [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0}, 46 [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0},
46 [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0}, 47 [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0},
47 [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16}, 48 [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16},
49#endif
48}; 50};
49 51
50/* convert tenth of dB volume (-730..60) to master volume register value */ 52/* convert tenth of dB volume (-730..60) to master volume register value */