diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /lib | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rbcodec/metadata/smaf.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/rbcodec/metadata/smaf.c b/lib/rbcodec/metadata/smaf.c index aeeadb431f..78e1fec499 100644 --- a/lib/rbcodec/metadata/smaf.c +++ b/lib/rbcodec/metadata/smaf.c | |||
@@ -34,11 +34,7 @@ static const int basebits[4] = { 4, 8, 12, 16 }; | |||
34 | static const int frequency[5] = { 4000, 8000, 11025, 22050, 44100 }; | 34 | static const int frequency[5] = { 4000, 8000, 11025, 22050, 44100 }; |
35 | 35 | ||
36 | static const int support_codepages[5] = { | 36 | static const int support_codepages[5] = { |
37 | #ifdef HAVE_LCD_BITMAP | ||
38 | SJIS, ISO_8859_1, -1, GB_2312, BIG_5, | 37 | SJIS, ISO_8859_1, -1, GB_2312, BIG_5, |
39 | #else | ||
40 | -1, ISO_8859_1, -1, -1, -1, | ||
41 | #endif | ||
42 | }; | 38 | }; |
43 | 39 | ||
44 | /* extra codepage */ | 40 | /* extra codepage */ |
@@ -170,13 +166,11 @@ static int read_audio_track_contets(int fd, int codepage, unsigned char **dst, | |||
170 | while ((*p & MASK) != COMP) | 166 | while ((*p & MASK) != COMP) |
171 | *q++ = *p++; | 167 | *q++ = *p++; |
172 | } | 168 | } |
173 | #ifdef HAVE_LCD_BITMAP | ||
174 | else if (codepage == SJIS) | 169 | else if (codepage == SJIS) |
175 | { | 170 | { |
176 | if (*p <= 0xa0 || *p >= 0xe0) | 171 | if (*p <= 0xa0 || *p >= 0xe0) |
177 | *q++ = *p++; | 172 | *q++ = *p++; |
178 | } | 173 | } |
179 | #endif | ||
180 | } | 174 | } |
181 | 175 | ||
182 | *q++ = *p++; | 176 | *q++ = *p++; |