diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-11 18:57:06 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-11 19:00:23 -0400 |
commit | 2dd1f37a109792b262a4000c050f7a48a145f1c4 (patch) | |
tree | c76ac85fd65972956ffe994158cc5ae9b43c99ca /firmware/drivers/audio/sdl.c | |
parent | f5a5b946867677de76c405ee72e2ea47e36e4c83 (diff) |
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/audio/sdl.c')
-rw-r--r-- | firmware/drivers/audio/sdl.c | 17 |
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 @@ * SDL. if we used DSP we would run code that doesn't actually run on the target **/ +#ifdef HAVE_SW_VOLUME_CONTROL +#include "pcm_sw_volume.h" + +void audiohw_set_master_vol(int vol_l, int vol_r) +{ + pcm_set_master_volume(vol_l, vol_r); +} +#else /* ndef HAVE_SW_VOLUME_CONTROL */ extern void pcm_set_mixer_volume(int); void audiohw_set_volume(int volume) @@ -44,6 +52,7 @@ void audiohw_set_volume(int volume) (void)volume; #endif /* CONFIG_CODEC == SWCODEC */ } +#endif /* HAVE_SW_VOLUME_CONTROL */ const struct sound_settings_info audiohw_settings[] = { [SOUND_VOLUME] = {"dB", 0, 1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25}, @@ -129,7 +138,13 @@ const struct sound_settings_info audiohw_settings[] = { **/ #if defined(AUDIOHW_HAVE_PRESCALER) -void audiohw_set_prescaler(int value) { (void)value; } +void audiohw_set_prescaler(int value) +{ +#ifdef HAVE_SW_VOLUME_CONTROL + pcm_set_prescaler(value); +#endif + (void)value; +} #endif #if defined(AUDIOHW_HAVE_BALANCE) void audiohw_set_balance(int value) { (void)value; } |