diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 11:18:03 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 11:18:03 +0000 |
| commit | e20ff44e9d9b03630db02ec3cafccc3153f208ee (patch) | |
| tree | 0a6b6b9055a34e16d69dd1612ad436c5db7820b8 | |
| parent | 8355ace582cbe2ce96fc1da0158e03b7b83c1145 (diff) | |
| download | rockbox-e20ff44e9d9b03630db02ec3cafccc3153f208ee.tar.gz rockbox-e20ff44e9d9b03630db02ec3cafccc3153f208ee.zip | |
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
| -rw-r--r-- | apps/metadata.c | 4 | ||||
| -rw-r--r-- | 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; | |||
| 61 | const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | 61 | const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = |
| 62 | { | 62 | { |
| 63 | /* Unknown file format */ | 63 | /* Unknown file format */ |
| 64 | [AFMT_UNKNOWN] = | 64 | [0 ... AFMT_NUM_CODECS-1] = |
| 65 | AFMT_ENTRY("???", NULL, NULL, NULL, NULL ), | 65 | AFMT_ENTRY("???", NULL, NULL, NULL, "" ), |
| 66 | 66 | ||
| 67 | /* MPEG Audio layer 2 */ | 67 | /* MPEG Audio layer 2 */ |
| 68 | [AFMT_MPA_L2] = | 68 | [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 | |||
| 36 | AFMT_UNKNOWN = 0, /* Unknown file format */ | 36 | AFMT_UNKNOWN = 0, /* Unknown file format */ |
| 37 | 37 | ||
| 38 | /* start formats */ | 38 | /* start formats */ |
| 39 | 39 | AFMT_MPA_L1, /* MPEG Audio layer 1 */ | |
| 40 | AFMT_MPA_L2, /* MPEG Audio layer 2 */ | 40 | AFMT_MPA_L2, /* MPEG Audio layer 2 */ |
| 41 | AFMT_MPA_L3, /* MPEG Audio layer 3 */ | 41 | AFMT_MPA_L3, /* MPEG Audio layer 3 */ |
| 42 | 42 | ||
| 43 | #if CONFIG_CODEC == SWCODEC | 43 | #if CONFIG_CODEC == SWCODEC |
| 44 | AFMT_MPA_L1, /* MPEG Audio layer 1 */ | ||
| 45 | AFMT_AIFF, /* Audio Interchange File Format */ | 44 | AFMT_AIFF, /* Audio Interchange File Format */ |
| 46 | AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */ | 45 | AFMT_PCM_WAV, /* Uncompressed PCM in a WAV file */ |
| 47 | AFMT_OGG_VORBIS, /* Ogg Vorbis */ | 46 | AFMT_OGG_VORBIS, /* Ogg Vorbis */ |