diff options
author | Mohamed Tarek <mt@rockbox.org> | 2009-07-27 12:13:22 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2009-07-27 12:13:22 +0000 |
commit | 5f5d105755d93e22d283e00b07775a4d935522d3 (patch) | |
tree | 0526359a5275b4185122a2f94ab5c6d1a7f13de6 /apps/metadata.c | |
parent | 320bd1adb84392273b7b713795a6148359395cf7 (diff) | |
download | rockbox-5f5d105755d93e22d283e00b07775a4d935522d3.tar.gz rockbox-5f5d105755d93e22d283e00b07775a4d935522d3.zip |
Change the naming scheme for codecs found in different containers.
Like changing AFMT_AAC to AFMT_MP4_AAC and AFMT_RAAC to AFMT_RM_AAC.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22066 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata.c')
-rw-r--r-- | apps/metadata.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/metadata.c b/apps/metadata.c index d01173737c..b3a4deb385 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -80,10 +80,10 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | |||
80 | [AFMT_WAVPACK] = | 80 | [AFMT_WAVPACK] = |
81 | AFMT_ENTRY("WV", "wavpack", "wavpack_enc", "wv\0" ), | 81 | AFMT_ENTRY("WV", "wavpack", "wavpack_enc", "wv\0" ), |
82 | /* Apple Lossless Audio Codec */ | 82 | /* Apple Lossless Audio Codec */ |
83 | [AFMT_ALAC] = | 83 | [AFMT_MP4_ALAC] = |
84 | AFMT_ENTRY("ALAC", "alac", NULL, "m4a\0m4b\0" ), | 84 | AFMT_ENTRY("ALAC", "alac", NULL, "m4a\0m4b\0" ), |
85 | /* Advanced Audio Coding in M4A container */ | 85 | /* Advanced Audio Coding in M4A container */ |
86 | [AFMT_AAC] = | 86 | [AFMT_MP4_AAC] = |
87 | AFMT_ENTRY("AAC", "aac", NULL, "mp4\0" ), | 87 | AFMT_ENTRY("AAC", "aac", NULL, "mp4\0" ), |
88 | /* Shorten */ | 88 | /* Shorten */ |
89 | [AFMT_SHN] = | 89 | [AFMT_SHN] = |
@@ -116,10 +116,10 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = | |||
116 | [AFMT_SAP] = | 116 | [AFMT_SAP] = |
117 | AFMT_ENTRY("SAP", "asap", NULL, "sap\0" ), | 117 | AFMT_ENTRY("SAP", "asap", NULL, "sap\0" ), |
118 | /* Cook in RM/RA */ | 118 | /* Cook in RM/RA */ |
119 | [AFMT_COOK] = | 119 | [AFMT_RM_COOK] = |
120 | AFMT_ENTRY("Cook", "cook", NULL, "rm\0ra\0rmvb\0" ), | 120 | AFMT_ENTRY("Cook", "cook", NULL, "rm\0ra\0rmvb\0" ), |
121 | /* AAC in RM/RA */ | 121 | /* AAC in RM/RA */ |
122 | [AFMT_RAAC] = | 122 | [AFMT_RM_AAC] = |
123 | AFMT_ENTRY("RAAC", "raac", NULL, "rm\0ra\0rmvb\0" ), | 123 | AFMT_ENTRY("RAAC", "raac", NULL, "rm\0ra\0rmvb\0" ), |
124 | #endif | 124 | #endif |
125 | }; | 125 | }; |
@@ -296,8 +296,8 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname) | |||
296 | 296 | ||
297 | break; | 297 | break; |
298 | 298 | ||
299 | case AFMT_ALAC: | 299 | case AFMT_MP4_ALAC: |
300 | case AFMT_AAC: | 300 | case AFMT_MP4_AAC: |
301 | if (!get_mp4_metadata(fd, id3)) | 301 | if (!get_mp4_metadata(fd, id3)) |
302 | { | 302 | { |
303 | return false; | 303 | return false; |
@@ -379,7 +379,7 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname) | |||
379 | id3->genre_string = id3_get_num_genre(36); | 379 | id3->genre_string = id3_get_num_genre(36); |
380 | break; | 380 | break; |
381 | 381 | ||
382 | case AFMT_COOK: | 382 | case AFMT_RM_COOK: |
383 | if (!get_rm_metadata(fd, id3)) | 383 | if (!get_rm_metadata(fd, id3)) |
384 | { | 384 | { |
385 | DEBUGF("get_rm_metadata error\n"); | 385 | DEBUGF("get_rm_metadata error\n"); |