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 | |
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
-rw-r--r-- | apps/codecs/libm4a/demux.c | 4 | ||||
-rw-r--r-- | apps/metadata.c | 14 | ||||
-rw-r--r-- | apps/metadata.h | 8 | ||||
-rw-r--r-- | apps/metadata/mp4.c | 2 | ||||
-rw-r--r-- | apps/metadata/rm.c | 2 | ||||
-rw-r--r-- | apps/playback.c | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c index f0c6922ca6..2cb236ae23 100644 --- a/apps/codecs/libm4a/demux.c +++ b/apps/codecs/libm4a/demux.c | |||
@@ -223,7 +223,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) | |||
223 | /* remaining is codec data */ | 223 | /* remaining is codec data */ |
224 | 224 | ||
225 | if ((qtmovie->res->format==MAKEFOURCC('a','l','a','c'))) { | 225 | if ((qtmovie->res->format==MAKEFOURCC('a','l','a','c'))) { |
226 | if (qtmovie->stream->ci->id3->codectype!=AFMT_ALAC) { | 226 | if (qtmovie->stream->ci->id3->codectype!=AFMT_MP4_ALAC) { |
227 | return false; | 227 | return false; |
228 | } | 228 | } |
229 | 229 | ||
@@ -254,7 +254,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) | |||
254 | stream_skip(qtmovie->stream, entry_remaining); | 254 | stream_skip(qtmovie->stream, entry_remaining); |
255 | 255 | ||
256 | } else if (qtmovie->res->format==MAKEFOURCC('m','p','4','a')) { | 256 | } else if (qtmovie->res->format==MAKEFOURCC('m','p','4','a')) { |
257 | if (qtmovie->stream->ci->id3->codectype!=AFMT_AAC) { | 257 | if (qtmovie->stream->ci->id3->codectype!=AFMT_MP4_AAC) { |
258 | return false; | 258 | return false; |
259 | } | 259 | } |
260 | 260 | ||
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"); |
diff --git a/apps/metadata.h b/apps/metadata.h index 0125b29e5e..cefc6c3945 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -49,8 +49,8 @@ enum | |||
49 | AFMT_MPC, /* Musepack */ | 49 | AFMT_MPC, /* Musepack */ |
50 | AFMT_A52, /* A/52 (aka AC3) audio */ | 50 | AFMT_A52, /* A/52 (aka AC3) audio */ |
51 | AFMT_WAVPACK, /* WavPack */ | 51 | AFMT_WAVPACK, /* WavPack */ |
52 | AFMT_ALAC, /* Apple Lossless Audio Codec */ | 52 | AFMT_MP4_ALAC, /* Apple Lossless Audio Codec */ |
53 | AFMT_AAC, /* Advanced Audio Coding (AAC) in M4A container */ | 53 | AFMT_MP4_AAC, /* Advanced Audio Coding (AAC) in M4A container */ |
54 | AFMT_SHN, /* Shorten */ | 54 | AFMT_SHN, /* Shorten */ |
55 | AFMT_SID, /* SID File Format */ | 55 | AFMT_SID, /* SID File Format */ |
56 | AFMT_ADX, /* ADX File Format */ | 56 | AFMT_ADX, /* ADX File Format */ |
@@ -61,8 +61,8 @@ enum | |||
61 | AFMT_WMA, /* WMAV1/V2 in ASF */ | 61 | AFMT_WMA, /* WMAV1/V2 in ASF */ |
62 | AFMT_MOD, /* Amiga MOD File Format */ | 62 | AFMT_MOD, /* Amiga MOD File Format */ |
63 | AFMT_SAP, /* Amiga 8Bit SAP Format */ | 63 | AFMT_SAP, /* Amiga 8Bit SAP Format */ |
64 | AFMT_COOK, /* Cook in RM/RA */ | 64 | AFMT_RM_COOK, /* Cook in RM/RA */ |
65 | AFMT_RAAC, /* AAC in RM/RA */ | 65 | AFMT_RM_AAC, /* AAC in RM/RA */ |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | /* add new formats at any index above this line to have a sensible order - | 68 | /* add new formats at any index above this line to have a sensible order - |
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c index f39d3f138e..00f0bf9d4c 100644 --- a/apps/metadata/mp4.c +++ b/apps/metadata/mp4.c | |||
@@ -650,7 +650,7 @@ static bool read_mp4_container(int fd, struct mp3entry* id3, | |||
650 | { | 650 | { |
651 | uint32_t frequency; | 651 | uint32_t frequency; |
652 | 652 | ||
653 | id3->codectype = (type == MP4_mp4a) ? AFMT_AAC : AFMT_ALAC; | 653 | id3->codectype = (type == MP4_mp4a) ? AFMT_MP4_AAC : AFMT_MP4_ALAC; |
654 | lseek(fd, 22, SEEK_CUR); | 654 | lseek(fd, 22, SEEK_CUR); |
655 | read_uint32be(fd, &frequency); | 655 | read_uint32be(fd, &frequency); |
656 | size -= 26; | 656 | size -= 26; |
diff --git a/apps/metadata/rm.c b/apps/metadata/rm.c index ee6b40bf94..8a2583961a 100644 --- a/apps/metadata/rm.c +++ b/apps/metadata/rm.c | |||
@@ -405,7 +405,7 @@ bool get_rm_metadata(int fd, struct mp3entry* id3) | |||
405 | /* Already set, do nothing */ | 405 | /* Already set, do nothing */ |
406 | break; | 406 | break; |
407 | case aac: | 407 | case aac: |
408 | id3->codectype = AFMT_RAAC; | 408 | id3->codectype = AFMT_RM_AAC; |
409 | break; | 409 | break; |
410 | } | 410 | } |
411 | 411 | ||
diff --git a/apps/playback.c b/apps/playback.c index 398f00da3b..2a015da4c5 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -1941,7 +1941,7 @@ static void audio_finish_load_track(void) | |||
1941 | case AFMT_FLAC: | 1941 | case AFMT_FLAC: |
1942 | case AFMT_PCM_WAV: | 1942 | case AFMT_PCM_WAV: |
1943 | case AFMT_A52: | 1943 | case AFMT_A52: |
1944 | case AFMT_AAC: | 1944 | case AFMT_MP4_AAC: |
1945 | case AFMT_MPC: | 1945 | case AFMT_MPC: |
1946 | case AFMT_APE: | 1946 | case AFMT_APE: |
1947 | case AFMT_WMA: | 1947 | case AFMT_WMA: |