diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-07-20 22:13:24 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-07-20 22:13:24 +0000 |
commit | d0bb88a7665d5a94076f8612538b7459e6d59ead (patch) | |
tree | 5a37a8017177f9c521c5e918760964cf4ca73147 | |
parent | 11888059a8f26d236812cd8693f7e82bf3151c3d (diff) | |
download | rockbox-d0bb88a7665d5a94076f8612538b7459e6d59ead.tar.gz rockbox-d0bb88a7665d5a94076f8612538b7459e6d59ead.zip |
Const'ed the various setting lookup tables
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4904 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/recorder/recording.c | 2 | ||||
-rw-r--r-- | apps/sound_menu.c | 2 | ||||
-rw-r--r-- | firmware/export/mp3_playback.h | 2 | ||||
-rw-r--r-- | firmware/mp3_playback.c | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 60b6e4743e..a077c957a7 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -89,7 +89,7 @@ static char *fmtstr[] = | |||
89 | char *fmt_gain(int snd, int val, char *str, int len) | 89 | char *fmt_gain(int snd, int val, char *str, int len) |
90 | { | 90 | { |
91 | int tmp, i, d, numdec; | 91 | int tmp, i, d, numdec; |
92 | char *unit; | 92 | const char *unit; |
93 | 93 | ||
94 | tmp = mpeg_val2phys(snd, val); | 94 | tmp = mpeg_val2phys(snd, val); |
95 | numdec = mpeg_sound_numdecimals(snd); | 95 | numdec = mpeg_sound_numdecimals(snd); |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 6265114406..8b762823f3 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -52,7 +52,7 @@ bool set_sound(char* string, | |||
52 | int numdec; | 52 | int numdec; |
53 | int integer; | 53 | int integer; |
54 | int dec; | 54 | int dec; |
55 | char* unit; | 55 | const char* unit; |
56 | char str[32]; | 56 | char str[32]; |
57 | int talkunit = UNIT_INT; | 57 | int talkunit = UNIT_INT; |
58 | int steps; | 58 | int steps; |
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h index 2370614e19..b4719b7d9b 100644 --- a/firmware/export/mp3_playback.h +++ b/firmware/export/mp3_playback.h | |||
@@ -36,7 +36,7 @@ int mpeg_sound_max(int setting); | |||
36 | int mpeg_sound_default(int setting); | 36 | int mpeg_sound_default(int setting); |
37 | void mpeg_sound_channel_config(int configuration); | 37 | void mpeg_sound_channel_config(int configuration); |
38 | int mpeg_val2phys(int setting, int value); | 38 | int mpeg_val2phys(int setting, int value); |
39 | char *mpeg_sound_unit(int setting); | 39 | const char *mpeg_sound_unit(int setting); |
40 | int mpeg_sound_numdecimals(int setting); | 40 | int mpeg_sound_numdecimals(int setting); |
41 | int mpeg_sound_steps(int setting); | 41 | int mpeg_sound_steps(int setting); |
42 | #if defined(HAVE_MAS3587F) || defined(SIMULATOR) | 42 | #if defined(HAVE_MAS3587F) || defined(SIMULATOR) |
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c index 7d68976547..44a7eef666 100644 --- a/firmware/mp3_playback.c +++ b/firmware/mp3_playback.c | |||
@@ -61,7 +61,7 @@ static long cumulative_ticks; | |||
61 | static void (*callback_for_more)(unsigned char**, int*); | 61 | static void (*callback_for_more)(unsigned char**, int*); |
62 | #endif /* #ifndef SIMULATOR */ | 62 | #endif /* #ifndef SIMULATOR */ |
63 | 63 | ||
64 | static char *units[] = | 64 | static const char* const units[] = |
65 | { | 65 | { |
66 | "%", /* Volume */ | 66 | "%", /* Volume */ |
67 | "dB", /* Bass */ | 67 | "dB", /* Bass */ |
@@ -81,7 +81,7 @@ static char *units[] = | |||
81 | "", /* Super bass */ | 81 | "", /* Super bass */ |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static int numdecimals[] = | 84 | static const int numdecimals[] = |
85 | { | 85 | { |
86 | 0, /* Volume */ | 86 | 0, /* Volume */ |
87 | 0, /* Bass */ | 87 | 0, /* Bass */ |
@@ -101,7 +101,7 @@ static int numdecimals[] = | |||
101 | 0, /* Super bass */ | 101 | 0, /* Super bass */ |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static int steps[] = | 104 | static const int steps[] = |
105 | { | 105 | { |
106 | 1, /* Volume */ | 106 | 1, /* Volume */ |
107 | 1, /* Bass */ | 107 | 1, /* Bass */ |
@@ -121,7 +121,7 @@ static int steps[] = | |||
121 | 1, /* Super bass */ | 121 | 1, /* Super bass */ |
122 | }; | 122 | }; |
123 | 123 | ||
124 | static int minval[] = | 124 | static const int minval[] = |
125 | { | 125 | { |
126 | 0, /* Volume */ | 126 | 0, /* Volume */ |
127 | #ifdef HAVE_MAS3587F | 127 | #ifdef HAVE_MAS3587F |
@@ -146,7 +146,7 @@ static int minval[] = | |||
146 | 0, /* Super bass */ | 146 | 0, /* Super bass */ |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static int maxval[] = | 149 | static const int maxval[] = |
150 | { | 150 | { |
151 | 100, /* Volume */ | 151 | 100, /* Volume */ |
152 | #ifdef HAVE_MAS3587F | 152 | #ifdef HAVE_MAS3587F |
@@ -171,7 +171,7 @@ static int maxval[] = | |||
171 | 1, /* Super bass */ | 171 | 1, /* Super bass */ |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static int defaultval[] = | 174 | static const int defaultval[] = |
175 | { | 175 | { |
176 | 70, /* Volume */ | 176 | 70, /* Volume */ |
177 | #ifdef HAVE_MAS3587F | 177 | #ifdef HAVE_MAS3587F |
@@ -196,7 +196,7 @@ static int defaultval[] = | |||
196 | 0, /* Super bass */ | 196 | 0, /* Super bass */ |
197 | }; | 197 | }; |
198 | 198 | ||
199 | char *mpeg_sound_unit(int setting) | 199 | const char *mpeg_sound_unit(int setting) |
200 | { | 200 | { |
201 | return units[setting]; | 201 | return units[setting]; |
202 | } | 202 | } |