diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-20 04:06:13 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-22 20:38:17 -0400 |
commit | e61e9c61d0ba6990576d59efca07afa13fd97566 (patch) | |
tree | 4b17b22dd4f56568666e25292f38224529ec7113 /firmware/target/hosted/maemo/pcm-gstreamer.c | |
parent | 91b33d5a3e92d62cf6fb6be875437d35b632caf5 (diff) | |
download | rockbox-e61e9c61d0ba6990576d59efca07afa13fd97566.tar.gz rockbox-e61e9c61d0ba6990576d59efca07afa13fd97566.zip |
Do some cleanup, adjustment and a couple fixes to recent sound changes.
* SOUND_x enum can be generated by audiohw_settings.h along with settings
entries and sound_val2phys.
* VOLUME_MIN and VOLUME_MAX are no longer necessary within sound.c. If
you need them, they are for target-defined purposes.
* Fix up SDL volume implementation in sdl.c. Move sim volume calculation
code to pcm-sdl.c.
* Min trigger tresholds were based upon VOLUME_MIN for some reason.
These setting have nothing to do with playback volume. Since it is no
longer present, set these at -89dB which is the minimum peak meter
sensitivity setting.
* Fix an oversight in wm8758.c. I forgot to add the dB->register
conversion to audiohw_set_volume.
Change-Id: Ie1df33f1793eee75e6793f16bc7bddd16edb7f75
Diffstat (limited to 'firmware/target/hosted/maemo/pcm-gstreamer.c')
-rw-r--r-- | firmware/target/hosted/maemo/pcm-gstreamer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/hosted/maemo/pcm-gstreamer.c b/firmware/target/hosted/maemo/pcm-gstreamer.c index 10a9d77880..5bca6f2d92 100644 --- a/firmware/target/hosted/maemo/pcm-gstreamer.c +++ b/firmware/target/hosted/maemo/pcm-gstreamer.c | |||
@@ -427,9 +427,9 @@ void pcm_play_dma_postinit(void) | |||
427 | 427 | ||
428 | void pcm_set_mixer_volume(int volume) | 428 | void pcm_set_mixer_volume(int volume) |
429 | { | 429 | { |
430 | /* gstreamer volume range is from 0.00 to 1.00 */ | 430 | /* gstreamer volume range is from 0.00 to 1.00 |
431 | gdouble gst_vol = (gdouble)(volume - VOLUME_MIN) / (gdouble)VOLUME_RANGE; | 431 | * input is -990..0 */ |
432 | 432 | gdouble gst_vol = 1.0f - (gdouble)volume / -990.0f; | |
433 | g_object_set (G_OBJECT(gst_volume), "volume", gst_vol, NULL); | 433 | g_object_set (G_OBJECT(gst_volume), "volume", gst_vol, NULL); |
434 | } | 434 | } |
435 | 435 | ||