summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-04-11 18:57:06 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-04-11 19:00:23 -0400
commit2dd1f37a109792b262a4000c050f7a48a145f1c4 (patch)
treec76ac85fd65972956ffe994158cc5ae9b43c99ca /firmware/drivers
parentf5a5b946867677de76c405ee72e2ea47e36e4c83 (diff)
downloadrockbox-2dd1f37a109792b262a4000c050f7a48a145f1c4.tar.gz
rockbox-2dd1f37a109792b262a4000c050f7a48a145f1c4.zip
Fix f5a5b94 errors. Employ SW volume for select targets on SIM.
Onda VX747 sim was missing a limits #define; #include limits.h in pcm_sw_volume.h. Simply use the software volume control for the SIM volume control rather than the SDL volume control when the target would have it natively. Change-Id: I8e924a2ff1b410f602452d2ea9b691efb82c931e
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/audio/sdl.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/firmware/drivers/audio/sdl.c b/firmware/drivers/audio/sdl.c
index b9df35b852..3c7cc55ce9 100644
--- a/firmware/drivers/audio/sdl.c
+++ b/firmware/drivers/audio/sdl.c
@@ -29,6 +29,14 @@
29 * SDL. if we used DSP we would run code that doesn't actually run on the target 29 * SDL. if we used DSP we would run code that doesn't actually run on the target
30 **/ 30 **/
31 31
32#ifdef HAVE_SW_VOLUME_CONTROL
33#include "pcm_sw_volume.h"
34
35void audiohw_set_master_vol(int vol_l, int vol_r)
36{
37 pcm_set_master_volume(vol_l, vol_r);
38}
39#else /* ndef HAVE_SW_VOLUME_CONTROL */
32extern void pcm_set_mixer_volume(int); 40extern void pcm_set_mixer_volume(int);
33 41
34void audiohw_set_volume(int volume) 42void audiohw_set_volume(int volume)
@@ -44,6 +52,7 @@ void audiohw_set_volume(int volume)
44 (void)volume; 52 (void)volume;
45#endif /* CONFIG_CODEC == SWCODEC */ 53#endif /* CONFIG_CODEC == SWCODEC */
46} 54}
55#endif /* HAVE_SW_VOLUME_CONTROL */
47 56
48const struct sound_settings_info audiohw_settings[] = { 57const struct sound_settings_info audiohw_settings[] = {
49 [SOUND_VOLUME] = {"dB", 0, 1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25}, 58 [SOUND_VOLUME] = {"dB", 0, 1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25},
@@ -129,7 +138,13 @@ const struct sound_settings_info audiohw_settings[] = {
129 **/ 138 **/
130 139
131#if defined(AUDIOHW_HAVE_PRESCALER) 140#if defined(AUDIOHW_HAVE_PRESCALER)
132void audiohw_set_prescaler(int value) { (void)value; } 141void audiohw_set_prescaler(int value)
142{
143#ifdef HAVE_SW_VOLUME_CONTROL
144 pcm_set_prescaler(value);
145#endif
146 (void)value;
147}
133#endif 148#endif
134#if defined(AUDIOHW_HAVE_BALANCE) 149#if defined(AUDIOHW_HAVE_BALANCE)
135void audiohw_set_balance(int value) { (void)value; } 150void audiohw_set_balance(int value) { (void)value; }