3 files changed, 9 insertions, 7 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)
 
 void pcm_set_mixer_volume(int volume)
 {
-    /* gstreamer volume range is from 0.00 to 1.00 */
-    gdouble gst_vol = (gdouble)(volume - VOLUME_MIN) / (gdouble)VOLUME_RANGE;
-
+    /* gstreamer volume range is from 0.00 to 1.00
+     * input is -990..0 */
+    gdouble gst_vol = 1.0f - (gdouble)volume / -990.0f;
     g_object_set (G_OBJECT(gst_volume), "volume", gst_vol, NULL);
 }
 
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c
index 812211288e..beefc7818c 100644
--- a/firmware/target/hosted/sdl/pcm-sdl.c
+++ b/firmware/target/hosted/sdl/pcm-sdl.c
@@ -421,7 +421,9 @@ void pcm_play_dma_postinit(void)
 #ifndef HAVE_SW_VOLUME_CONTROL
 void pcm_set_mixer_volume(int volume)
 {
-    sim_volume = volume;
+    int minvol = sound_min(SOUND_VOLUME);
+    int volrange = sound_max(SOUND_VOLUME) - minvol;
+    sim_volume = SDL_MIX_MAXVOLUME * (volume / 10 - minvol) / volrange;
 }
 #endif /* HAVE_SW_VOLUME_CONTROL */
 
diff --git a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
index ee15b27fae..702f3bb50e 100644
--- a/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/codec-jz4740.c
@@ -273,9 +273,9 @@ void audiohw_init(void)
 void audiohw_set_volume(int vol_l, int vol_r)
 {
 #ifdef HAVE_SW_VOLUME_CONTROL
-    /* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */
-    int sw_volume_l = vol_l < VOLUME_MIN ? PCM_MUTE_LEVEL : MIN(vol_l, 0);
-    int sw_volume_r = vol_r < VOLUME_MIN ? PCM_MUTE_LEVEL : MIN(vol_r, 0);
+    /* SW volume for <= 1.0 gain, HW at unity, < -740 == MUTE */
+    int sw_volume_l = vol_l <= -740 ? PCM_MUTE_LEVEL : MIN(vol_l, 0);
+    int sw_volume_r = vol_r <= -740 ? PCM_MUTE_LEVEL : MIN(vol_r, 0);
     pcm_set_master_volume(sw_volume_l, sw_volume_r);
 #endif /* HAVE_SW_VOLUME_CONTROL */