summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-07-20 22:13:24 +0000
committerJens Arnold <amiconn@rockbox.org>2004-07-20 22:13:24 +0000
commitd0bb88a7665d5a94076f8612538b7459e6d59ead (patch)
tree5a37a8017177f9c521c5e918760964cf4ca73147
parent11888059a8f26d236812cd8693f7e82bf3151c3d (diff)
downloadrockbox-d0bb88a7665d5a94076f8612538b7459e6d59ead.zip
rockbox-d0bb88a7665d5a94076f8612538b7459e6d59ead.tar.gz
rockbox-d0bb88a7665d5a94076f8612538b7459e6d59ead.tar.bz2
rockbox-d0bb88a7665d5a94076f8612538b7459e6d59ead.tar.xz
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.c2
-rw-r--r--apps/sound_menu.c2
-rw-r--r--firmware/export/mp3_playback.h2
-rw-r--r--firmware/mp3_playback.c14
4 files changed, 10 insertions, 10 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 60b6e47..a077c95 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -89,7 +89,7 @@ static char *fmtstr[] =
char *fmt_gain(int snd, int val, char *str, int len)
{
int tmp, i, d, numdec;
- char *unit;
+ const char *unit;
tmp = mpeg_val2phys(snd, val);
numdec = mpeg_sound_numdecimals(snd);
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index 6265114..8b76282 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -52,7 +52,7 @@ bool set_sound(char* string,
int numdec;
int integer;
int dec;
- char* unit;
+ const char* unit;
char str[32];
int talkunit = UNIT_INT;
int steps;
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h
index 2370614..b4719b7 100644
--- a/firmware/export/mp3_playback.h
+++ b/firmware/export/mp3_playback.h
@@ -36,7 +36,7 @@ int mpeg_sound_max(int setting);
int mpeg_sound_default(int setting);
void mpeg_sound_channel_config(int configuration);
int mpeg_val2phys(int setting, int value);
-char *mpeg_sound_unit(int setting);
+const char *mpeg_sound_unit(int setting);
int mpeg_sound_numdecimals(int setting);
int mpeg_sound_steps(int setting);
#if defined(HAVE_MAS3587F) || defined(SIMULATOR)
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index 7d68976..44a7eef 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -61,7 +61,7 @@ static long cumulative_ticks;
static void (*callback_for_more)(unsigned char**, int*);
#endif /* #ifndef SIMULATOR */
-static char *units[] =
+static const char* const units[] =
{
"%", /* Volume */
"dB", /* Bass */
@@ -81,7 +81,7 @@ static char *units[] =
"", /* Super bass */
};
-static int numdecimals[] =
+static const int numdecimals[] =
{
0, /* Volume */
0, /* Bass */
@@ -101,7 +101,7 @@ static int numdecimals[] =
0, /* Super bass */
};
-static int steps[] =
+static const int steps[] =
{
1, /* Volume */
1, /* Bass */
@@ -121,7 +121,7 @@ static int steps[] =
1, /* Super bass */
};
-static int minval[] =
+static const int minval[] =
{
0, /* Volume */
#ifdef HAVE_MAS3587F
@@ -146,7 +146,7 @@ static int minval[] =
0, /* Super bass */
};
-static int maxval[] =
+static const int maxval[] =
{
100, /* Volume */
#ifdef HAVE_MAS3587F
@@ -171,7 +171,7 @@ static int maxval[] =
1, /* Super bass */
};
-static int defaultval[] =
+static const int defaultval[] =
{
70, /* Volume */
#ifdef HAVE_MAS3587F
@@ -196,7 +196,7 @@ static int defaultval[] =
0, /* Super bass */
};
-char *mpeg_sound_unit(int setting)
+const char *mpeg_sound_unit(int setting)
{
return units[setting];
}