diff options
author | Robert Hak <adiamas@rockbox.org> | 2002-10-03 09:40:19 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2002-10-03 09:40:19 +0000 |
commit | 0478236611f4a1e5f3a6690c72fd650d0975309c (patch) | |
tree | ce110bb19c7e8c85d667df11d77b2fcccb8eba9d | |
parent | 40ffbb1a89a5e75e7d79c87d3eee960fe17eba55 (diff) | |
download | rockbox-0478236611f4a1e5f3a6690c72fd650d0975309c.tar.gz rockbox-0478236611f4a1e5f3a6690c72fd650d0975309c.zip |
volume now increments by 1 not 2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2487 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/mpeg.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index d7c360550a..0551f40c4b 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -91,13 +91,13 @@ static int minval[] = | |||
91 | -50, /* Balance */ | 91 | -50, /* Balance */ |
92 | 0, /* Loudness */ | 92 | 0, /* Loudness */ |
93 | 0, /* Bass boost */ | 93 | 0, /* Bass boost */ |
94 | -1, /* AVC */ | 94 | -1, /* AVC */ |
95 | 0 /* Channels */ | 95 | 0 /* Channels */ |
96 | }; | 96 | }; |
97 | 97 | ||
98 | static int maxval[] = | 98 | static int maxval[] = |
99 | { | 99 | { |
100 | 50, /* Volume */ | 100 | 100, /* Volume */ |
101 | #ifdef HAVE_MAS3587F | 101 | #ifdef HAVE_MAS3587F |
102 | 24, /* Bass */ | 102 | 24, /* Bass */ |
103 | 24, /* Treble */ | 103 | 24, /* Treble */ |
@@ -114,7 +114,7 @@ static int maxval[] = | |||
114 | 114 | ||
115 | static int defaultval[] = | 115 | static int defaultval[] = |
116 | { | 116 | { |
117 | 70/2, /* Volume */ | 117 | 70, /* Volume */ |
118 | #ifdef HAVE_MAS3587F | 118 | #ifdef HAVE_MAS3587F |
119 | 12+6, /* Bass */ | 119 | 12+6, /* Bass */ |
120 | 12+6, /* Treble */ | 120 | 12+6, /* Treble */ |
@@ -1609,7 +1609,8 @@ void mpeg_sound_set(int setting, int value) | |||
1609 | switch(setting) | 1609 | switch(setting) |
1610 | { | 1610 | { |
1611 | case SOUND_VOLUME: | 1611 | case SOUND_VOLUME: |
1612 | value *= 2; /* Convert to percent */ | 1612 | /* We are doing increments of 1 */ |
1613 | /*value *= 2;*/ /* Convert to percent */ | ||
1613 | 1614 | ||
1614 | #ifdef HAVE_MAS3587F | 1615 | #ifdef HAVE_MAS3587F |
1615 | tmp = 0x7f00 * value / 100; | 1616 | tmp = 0x7f00 * value / 100; |
@@ -1738,7 +1739,8 @@ int mpeg_val2phys(int setting, int value) | |||
1738 | switch(setting) | 1739 | switch(setting) |
1739 | { | 1740 | { |
1740 | case SOUND_VOLUME: | 1741 | case SOUND_VOLUME: |
1741 | result = value * 2; | 1742 | /* result = value * 2;*/ |
1743 | result = value; | ||
1742 | break; | 1744 | break; |
1743 | 1745 | ||
1744 | case SOUND_BALANCE: | 1746 | case SOUND_BALANCE: |