From 003a4a11c4f4a9d8c4e16a29665064ebbb365e34 Mon Sep 17 00:00:00 2001 From: Dan Everton Date: Sat, 13 Oct 2007 23:01:10 +0000 Subject: Make the volume range in the simulator match the target being simulated. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15100 a1c6a512-1295-4272-9138-f99709370657 --- firmware/sound.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/sound.c b/firmware/sound.c index 6d510cc896..701b008fc3 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -47,7 +47,7 @@ extern unsigned shadow_codec_reg0; #ifdef SIMULATOR /* dummy for sim */ const struct sound_settings_info audiohw_settings[] = { - [SOUND_VOLUME] = {"dB", 0, 1, -40, 6, -25}, + [SOUND_VOLUME] = {"dB", 0, 1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25}, [SOUND_BASS] = {"dB", 0, 1, -24, 24, 0}, [SOUND_TREBLE] = {"dB", 0, 1, -24, 24, 0}, [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, @@ -666,7 +666,8 @@ void sound_set_superbass(int value) int sim_volume; void sound_set_volume(int value) { - sim_volume =128*(value +40)/46; /* 128 is SDL_MIX_MAXVOLUME */ + /* 128 is SDL_MIX_MAXVOLUME */ + sim_volume = 128 * (value - VOLUME_MIN / 10) / ((VOLUME_MAX - VOLUME_MIN) / 10); } void sound_set_balance(int value) -- cgit