diff options
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); |