diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2018-02-19 16:28:11 +1100 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-31 14:16:31 +0000 |
commit | dd82f13fa1241266576b508180fcf90b8d9bda2c (patch) | |
tree | cdae2331353e4f85a296782b14001d021923ddfc /firmware/drivers/audio/nwzlinux-codec.c | |
parent | ce9e7e712238dc69a825a49f4f226ff47fbbff69 (diff) | |
download | rockbox-dd82f13fa1241266576b508180fcf90b8d9bda2c.tar.gz rockbox-dd82f13fa1241266576b508180fcf90b8d9bda2c.zip |
nwz/alsa: various improvements
Also audiohw driver to specific device name, rewrite alsa controls code to
cache more data, thus making the code easier and use less stack. Avoid using
short/long in pcm alsa code since it's the wrong size on 64-bit (simulator
for example)
Change-Id: Ibc1ec44396e37b6cbdedbcf37300878638e5d2d3
Diffstat (limited to 'firmware/drivers/audio/nwzlinux-codec.c')
-rw-r--r-- | firmware/drivers/audio/nwzlinux-codec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/drivers/audio/nwzlinux-codec.c b/firmware/drivers/audio/nwzlinux-codec.c index ca5e274255..5085befb20 100644 --- a/firmware/drivers/audio/nwzlinux-codec.c +++ b/firmware/drivers/audio/nwzlinux-codec.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "audio.h" | 26 | #include "audio.h" |
27 | #include "sound.h" | 27 | #include "sound.h" |
28 | #include "audiohw.h" | 28 | #include "audiohw.h" |
29 | #include "cscodec.h" | ||
30 | #include "nwzlinux_codec.h" | 29 | #include "nwzlinux_codec.h" |
31 | #include "stdlib.h" | 30 | #include "stdlib.h" |
32 | #include "panic.h" | 31 | #include "panic.h" |
@@ -313,7 +312,7 @@ void audiohw_set_playback_src(enum nwz_src_t src) | |||
313 | 312 | ||
314 | void audiohw_preinit(void) | 313 | void audiohw_preinit(void) |
315 | { | 314 | { |
316 | alsa_controls_init(); | 315 | alsa_controls_init("default"); |
317 | /* turn on codec */ | 316 | /* turn on codec */ |
318 | alsa_controls_set_bool("CODEC Power Switch", true); | 317 | alsa_controls_set_bool("CODEC Power Switch", true); |
319 | /* mute */ | 318 | /* mute */ |
@@ -416,7 +415,7 @@ void audiohw_set_volume(int vol_l, int vol_r) | |||
416 | printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10); | 415 | printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10); |
417 | nwz_set_driver_vol(drv_vol); | 416 | nwz_set_driver_vol(drv_vol); |
418 | printf(" set digital volume %d dB\n", vol / 10); | 417 | printf(" set digital volume %d dB\n", vol / 10); |
419 | pcm_alsa_set_digital_volume(vol / 10, vol / 10); | 418 | pcm_set_mixer_volume(vol / 10, vol / 10); |
420 | } | 419 | } |
421 | 420 | ||
422 | void audiohw_close(void) | 421 | void audiohw_close(void) |