summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-06-28 12:39:47 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-06-28 12:39:47 +0000
commitfd42ceba7b2b56c764be2bcddc108f8fcd82571f (patch)
treeab57ba92f46c759ead02290c115bbe7833cd91a6 /firmware
parenta3a51eca66603b379558b81bb93bf69e88d4c074 (diff)
downloadrockbox-fd42ceba7b2b56c764be2bcddc108f8fcd82571f.tar.gz
rockbox-fd42ceba7b2b56c764be2bcddc108f8fcd82571f.zip
Added mpeg_sound_numdecimals()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1245 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/mpeg.c18
-rw-r--r--firmware/mpeg.h1
2 files changed, 16 insertions, 3 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index f309a78b7d..6aca3c5d89 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -52,6 +52,13 @@ static char *units[] =
52 "%" /* Treble */ 52 "%" /* Treble */
53}; 53};
54 54
55static int numdecimals[] =
56{
57 1, /* Volume */
58 2, /* Bass */
59 1 /* Treble */
60};
61
55static int minval[] = 62static int minval[] =
56{ 63{
57 0, /* Volume */ 64 0, /* Volume */
@@ -78,6 +85,11 @@ char *mpeg_sound_unit(int setting)
78 return units[setting]; 85 return units[setting];
79} 86}
80 87
88int mpeg_sound_numdecimals(int setting)
89{
90 return numdecimals[setting];
91}
92
81int mpeg_sound_min(int setting) 93int mpeg_sound_min(int setting)
82{ 94{
83 return minval[setting]; 95 return minval[setting];
@@ -738,15 +750,15 @@ int mpeg_val2phys(int setting, int value)
738 switch(setting) 750 switch(setting)
739 { 751 {
740 case SOUND_VOLUME: 752 case SOUND_VOLUME:
741 result = value * 2; 753 result = value * 20;
742 break; 754 break;
743 755
744 case SOUND_BASS: 756 case SOUND_BASS:
745 result = value * 2; 757 result = value * 200;
746 break; 758 break;
747 759
748 case SOUND_TREBLE: 760 case SOUND_TREBLE:
749 result = value * 2; 761 result = value * 20;
750 break; 762 break;
751 } 763 }
752 return result; 764 return result;
diff --git a/firmware/mpeg.h b/firmware/mpeg.h
index 66bad48583..919f857738 100644
--- a/firmware/mpeg.h
+++ b/firmware/mpeg.h
@@ -32,6 +32,7 @@ int mpeg_sound_max(int setting);
32int mpeg_sound_default(int setting); 32int mpeg_sound_default(int setting);
33int mpeg_val2phys(int setting, int value); 33int mpeg_val2phys(int setting, int value);
34char *mpeg_sound_unit(int setting); 34char *mpeg_sound_unit(int setting);
35int mpeg_sound_numdecimals(int setting);
35struct mp3entry* mpeg_current_track(void); 36struct mp3entry* mpeg_current_track(void);
36 37
37#define SOUND_VOLUME 0 38#define SOUND_VOLUME 0