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/sound.c | |
| parent | f5a5b946867677de76c405ee72e2ea47e36e4c83 (diff) | |
| download | rockbox-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/sound.c')
| -rw-r--r-- | firmware/sound.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index 2ffef0e72b..7c86b0bf05 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
| @@ -235,8 +235,10 @@ static void set_prescaled_volume(void) | |||
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | /* ypr0 with sdl has separate volume controls */ | 237 | /* ypr0 with sdl has separate volume controls */ |
| 238 | #if !defined(HAVE_SDL_AUDIO) || defined(SAMSUNG_YPR0) | 238 | #if defined(HAVE_SW_VOLUME_CONTROL) |
| 239 | #if defined(HAVE_SW_VOLUME_CONTROL) || defined(HAVE_JZ4740_CODEC) | 239 | audiohw_set_master_vol(l, r); |
| 240 | #elif !defined(HAVE_SDL_AUDIO) || defined(SAMSUNG_YPR0) | ||
| 241 | #if defined(HAVE_JZ4740_CODEC) | ||
| 240 | audiohw_set_master_vol(l, r); | 242 | audiohw_set_master_vol(l, r); |
| 241 | #elif CONFIG_CODEC == MAS3507D | 243 | #elif CONFIG_CODEC == MAS3507D |
| 242 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); | 244 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); |