summaryrefslogtreecommitdiff
path: root/lib/rbcodec/metadata/mp3.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 /lib/rbcodec/metadata/mp3.c
parent0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff)
downloadrockbox-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 'lib/rbcodec/metadata/mp3.c')
-rw-r--r--lib/rbcodec/metadata/mp3.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/rbcodec/metadata/mp3.c b/lib/rbcodec/metadata/mp3.c
index 2096e70898..ffe20fb3ea 100644
--- a/lib/rbcodec/metadata/mp3.c
+++ b/lib/rbcodec/metadata/mp3.c
@@ -108,11 +108,9 @@ static int getsonglength(int fd, struct mp3entry *entry)
108 entry->frequency = info.frequency; 108 entry->frequency = info.frequency;
109 entry->layer = info.layer; 109 entry->layer = info.layer;
110 switch(entry->layer) { 110 switch(entry->layer) {
111#if CONFIG_CODEC==SWCODEC
112 case 0: 111 case 0:
113 entry->codectype=AFMT_MPA_L1; 112 entry->codectype=AFMT_MPA_L1;
114 break; 113 break;
115#endif
116 case 1: 114 case 1:
117 entry->codectype=AFMT_MPA_L2; 115 entry->codectype=AFMT_MPA_L2;
118 break; 116 break;
@@ -143,12 +141,10 @@ static int getsonglength(int fd, struct mp3entry *entry)
143 entry->vbr = info.is_vbr; 141 entry->vbr = info.is_vbr;
144 entry->has_toc = info.has_toc; 142 entry->has_toc = info.has_toc;
145 143
146#if CONFIG_CODEC==SWCODEC
147 if (!entry->lead_trim) 144 if (!entry->lead_trim)
148 entry->lead_trim = info.enc_delay; 145 entry->lead_trim = info.enc_delay;
149 if (!entry->tail_trim) 146 if (!entry->tail_trim)
150 entry->tail_trim = info.enc_padding; 147 entry->tail_trim = info.enc_padding;
151#endif
152 148
153 memcpy(entry->toc, info.toc, sizeof(info.toc)); 149 memcpy(entry->toc, info.toc, sizeof(info.toc));
154 150