summaryrefslogtreecommitdiffstats
path: root/apps/screens.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-17 00:01:32 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-24 21:20:13 +0000
commit8cb555460ff79e636a7907fb2589e16db98c8600 (patch)
tree930a3878c7641c9ce045b24f0ade1309e36d5806 /apps/screens.c
parent0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff)
downloadrockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.gz
rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.bz2
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.c9
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 @@
#include "icons.h"
#include "font.h"
#include "audio.h"
-#include "mp3_playback.h"
#include "usb.h"
#include "settings.h"
#include "status.h"
@@ -380,10 +379,8 @@ static const int id3_headers[]=
LANG_ID3_PLAYLIST,
LANG_ID3_BITRATE,
LANG_ID3_FREQUENCY,
-#if CONFIG_CODEC == SWCODEC
LANG_ID3_TRACK_GAIN,
LANG_ID3_ALBUM_GAIN,
-#endif
LANG_FILESIZE,
LANG_ID3_PATH,
};
@@ -423,7 +420,6 @@ static void say_number_and_spell(char *buf, bool year_style)
}
}
-#if CONFIG_CODEC == SWCODEC
/* Say a replaygain ID3 value from its text form */
static void say_gain(char *buf)
{
@@ -479,7 +475,6 @@ static void say_gain(char *buf)
}else /* we didn't find a number, just spell everything */
talk_spell(buf, true);
}
-#endif
static const char * id3_get_or_speak_info(int selected_item, void* data,
char *buffer, size_t buffer_len,
@@ -619,7 +614,6 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
if(say_it)
talk_value(id3->frequency, UNIT_HERTZ, true);
break;
-#if CONFIG_CODEC == SWCODEC
case LANG_ID3_TRACK_GAIN:
replaygain_itoa(buffer, buffer_len, id3->track_level);
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,
if(say_it && val)
say_gain(val);
break;
-#endif
case LANG_ID3_PATH:
val=id3->path;
if(say_it && val)
talk_fullpath(val, true);
- break;
+ break;
case LANG_ID3_COMPOSER:
val=id3->composer;
if(say_it && val)