diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 00:01:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 8cb555460ff79e636a7907fb2589e16db98c8600 (patch) | |
tree | 930a3878c7641c9ce045b24f0ade1309e36d5806 /apps/screens.c | |
parent | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff) | |
download | rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.gz rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.zip |
[3/4] Completely remove HWCODEC support
'swcodec' is now always set (and recording_swcodec for recording-capable
units) in feature.txt so the manual and language strings don't need to
all be fixed up.
Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/screens.c b/apps/screens.c index ecd406037d..47f110efd9 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include "icons.h" | 30 | #include "icons.h" |
31 | #include "font.h" | 31 | #include "font.h" |
32 | #include "audio.h" | 32 | #include "audio.h" |
33 | #include "mp3_playback.h" | ||
34 | #include "usb.h" | 33 | #include "usb.h" |
35 | #include "settings.h" | 34 | #include "settings.h" |
36 | #include "status.h" | 35 | #include "status.h" |
@@ -380,10 +379,8 @@ static const int id3_headers[]= | |||
380 | LANG_ID3_PLAYLIST, | 379 | LANG_ID3_PLAYLIST, |
381 | LANG_ID3_BITRATE, | 380 | LANG_ID3_BITRATE, |
382 | LANG_ID3_FREQUENCY, | 381 | LANG_ID3_FREQUENCY, |
383 | #if CONFIG_CODEC == SWCODEC | ||
384 | LANG_ID3_TRACK_GAIN, | 382 | LANG_ID3_TRACK_GAIN, |
385 | LANG_ID3_ALBUM_GAIN, | 383 | LANG_ID3_ALBUM_GAIN, |
386 | #endif | ||
387 | LANG_FILESIZE, | 384 | LANG_FILESIZE, |
388 | LANG_ID3_PATH, | 385 | LANG_ID3_PATH, |
389 | }; | 386 | }; |
@@ -423,7 +420,6 @@ static void say_number_and_spell(char *buf, bool year_style) | |||
423 | } | 420 | } |
424 | } | 421 | } |
425 | 422 | ||
426 | #if CONFIG_CODEC == SWCODEC | ||
427 | /* Say a replaygain ID3 value from its text form */ | 423 | /* Say a replaygain ID3 value from its text form */ |
428 | static void say_gain(char *buf) | 424 | static void say_gain(char *buf) |
429 | { | 425 | { |
@@ -479,7 +475,6 @@ static void say_gain(char *buf) | |||
479 | }else /* we didn't find a number, just spell everything */ | 475 | }else /* we didn't find a number, just spell everything */ |
480 | talk_spell(buf, true); | 476 | talk_spell(buf, true); |
481 | } | 477 | } |
482 | #endif | ||
483 | 478 | ||
484 | static const char * id3_get_or_speak_info(int selected_item, void* data, | 479 | static const char * id3_get_or_speak_info(int selected_item, void* data, |
485 | char *buffer, size_t buffer_len, | 480 | char *buffer, size_t buffer_len, |
@@ -619,7 +614,6 @@ static const char * id3_get_or_speak_info(int selected_item, void* data, | |||
619 | if(say_it) | 614 | if(say_it) |
620 | talk_value(id3->frequency, UNIT_HERTZ, true); | 615 | talk_value(id3->frequency, UNIT_HERTZ, true); |
621 | break; | 616 | break; |
622 | #if CONFIG_CODEC == SWCODEC | ||
623 | case LANG_ID3_TRACK_GAIN: | 617 | case LANG_ID3_TRACK_GAIN: |
624 | replaygain_itoa(buffer, buffer_len, id3->track_level); | 618 | replaygain_itoa(buffer, buffer_len, id3->track_level); |
625 | val=(id3->track_level) ? buffer : NULL; /* only show level!=0 */ | 619 | val=(id3->track_level) ? buffer : NULL; /* only show level!=0 */ |
@@ -632,12 +626,11 @@ static const char * id3_get_or_speak_info(int selected_item, void* data, | |||
632 | if(say_it && val) | 626 | if(say_it && val) |
633 | say_gain(val); | 627 | say_gain(val); |
634 | break; | 628 | break; |
635 | #endif | ||
636 | case LANG_ID3_PATH: | 629 | case LANG_ID3_PATH: |
637 | val=id3->path; | 630 | val=id3->path; |
638 | if(say_it && val) | 631 | if(say_it && val) |
639 | talk_fullpath(val, true); | 632 | talk_fullpath(val, true); |
640 | break; | 633 | break; |
641 | case LANG_ID3_COMPOSER: | 634 | case LANG_ID3_COMPOSER: |
642 | val=id3->composer; | 635 | val=id3->composer; |
643 | if(say_it && val) | 636 | if(say_it && val) |