Fix non-working .talk clips on hwcodec (follow-up to r28672 and r29432): .talk clips
must be evaluated as MP3. Also fix supported formats: hwcodec doesn't support MP1.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30019 a1c6a512-1295-4272-9138-f99709370657
diff --git a/apps/metadata.c b/apps/metadata.c
index e886037..cbb5b42 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -64,17 +64,23 @@
[AFMT_UNKNOWN] =
AFMT_ENTRY("???", NULL, NULL, NULL, NULL ),
- /* MPEG Audio layer 1 */
- [AFMT_MPA_L1] =
- AFMT_ENTRY("MP1", "mpa", NULL, get_mp3_metadata, "mp1\0"),
/* MPEG Audio layer 2 */
[AFMT_MPA_L2] =
AFMT_ENTRY("MP2", "mpa", NULL, get_mp3_metadata, "mpa\0mp2\0"),
- /* MPEG Audio layer 3 */
+
+#if CONFIG_CODEC != SWCODEC
+ /* MPEG Audio layer 3 on HWCODEC: .talk clips, no encoder */
+ [AFMT_MPA_L3] =
+ AFMT_ENTRY("MP3", "mpa", NULL, get_mp3_metadata, "mp3\0talk\0"),
+
+#else /* CONFIG_CODEC == SWCODEC */
+ /* MPEG Audio layer 3 on SWCODEC */
[AFMT_MPA_L3] =
AFMT_ENTRY("MP3", "mpa", "mp3_enc", get_mp3_metadata, "mp3\0"),
-#if CONFIG_CODEC == SWCODEC
+ /* MPEG Audio layer 1 */
+ [AFMT_MPA_L1] =
+ AFMT_ENTRY("MP1", "mpa", NULL, get_mp3_metadata, "mp1\0"),
/* Audio Interchange File Format */
[AFMT_AIFF] =
AFMT_ENTRY("AIFF", "aiff", "aiff_enc", get_aiff_metadata, "aiff\0aif\0"),