From e20ff44e9d9b03630db02ec3cafccc3153f208ee Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 14 Aug 2011 11:18:03 +0000 Subject: Redo 30225 differently to not break the audio formats order for skins. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30296 a1c6a512-1295-4272-9138-f99709370657 --- apps/metadata.c | 4 ++-- apps/metadata.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/metadata.c b/apps/metadata.c index 8b1101eaa5..83ff365dbb 100644 --- a/apps/metadata.c +++ b/apps/metadata.c @@ -61,8 +61,8 @@ bool write_metadata_log = false; const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = { /* Unknown file format */ - [AFMT_UNKNOWN] = - AFMT_ENTRY("???", NULL, NULL, NULL, NULL ), + [0 ... AFMT_NUM_CODECS-1] = + AFMT_ENTRY("???", NULL, NULL, NULL, "" ), /* MPEG Audio layer 2 */ [AFMT_MPA_L2] = diff --git a/apps/metadata.h b/apps/metadata.h index 3c5efb7532..e1f30c170d 100644 --- a/apps/metadata.h +++ b/apps/metadata.h @@ -36,12 +36,11 @@ enum AFMT_UNKNOWN = 0, /* Unknown file format */ /* start formats */ - + AFMT_MPA_L1, /* MPEG Audio layer 1 */ AFMT_MPA_L2, /* MPEG Audio layer 2 */ AFMT_MPA_L3, /* MPEG Audio layer 3 */ #if CONFIG_CODEC == SWCODEC - AFMT_MPA_L1, /* MPEG Audio layer 1 */ AFMT_AIFF, /* Audio Interchange File Format */ AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */ AFMT_OGG_VORBIS, /* Ogg Vorbis */ -- cgit v1.2.3