diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 4 | ||||
-rw-r--r-- | apps/metadata.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index e6dfc95f12..5228dd16bc 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -64,10 +64,10 @@ | |||
64 | 64 | ||
65 | extern struct wps_state wps_state; | 65 | extern struct wps_state wps_state; |
66 | 66 | ||
67 | static char* get_codectype(const struct mp3entry* id3) | 67 | static const char* get_codectype(const struct mp3entry* id3) |
68 | { | 68 | { |
69 | if (id3 && id3->codectype < AFMT_NUM_CODECS) { | 69 | if (id3 && id3->codectype < AFMT_NUM_CODECS) { |
70 | return (char*)audio_formats[id3->codectype].label; | 70 | return audio_formats[id3->codectype].label; |
71 | } else { | 71 | } else { |
72 | return NULL; | 72 | return NULL; |
73 | } | 73 | } |
diff --git a/apps/metadata.h b/apps/metadata.h index 7bf086f27d..0d0f6c5aac 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -153,16 +153,16 @@ extern const int afmt_rec_format[AFMT_NUM_CODECS]; | |||
153 | /* record describing the audio format */ | 153 | /* record describing the audio format */ |
154 | struct afmt_entry | 154 | struct afmt_entry |
155 | { | 155 | { |
156 | char label[8]; /* format label */ | 156 | const char *label; /* format label */ |
157 | #if CONFIG_CODEC == SWCODEC | 157 | #if CONFIG_CODEC == SWCODEC |
158 | char *codec_root_fn; /* root codec filename (sans _enc and .codec) */ | 158 | const char *codec_root_fn; /* root codec filename (sans _enc and .codec) */ |
159 | #ifdef HAVE_RECORDING | 159 | #ifdef HAVE_RECORDING |
160 | char *codec_enc_root_fn; /* filename of encoder codec */ | 160 | const char *codec_enc_root_fn; /* filename of encoder codec */ |
161 | #endif | 161 | #endif |
162 | #endif | 162 | #endif |
163 | char *ext_list; /* double NULL terminated extension | 163 | const char *ext_list; /* double NULL terminated extension |
164 | list for type with the first as | 164 | list for type with the first as |
165 | the default for recording */ | 165 | the default for recording */ |
166 | }; | 166 | }; |
167 | 167 | ||
168 | /* database of labels and codecs. add formats per above enum */ | 168 | /* database of labels and codecs. add formats per above enum */ |