From 5f5d105755d93e22d283e00b07775a4d935522d3 Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Mon, 27 Jul 2009 12:13:22 +0000 Subject: 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 --- apps/codecs/libm4a/demux.c | 4 ++-- apps/metadata.c | 14 +++++++------- apps/metadata.h | 8 ++++---- apps/metadata/mp4.c | 2 +- apps/metadata/rm.c | 2 +- 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) /* remaining is codec data */ if ((qtmovie->res->format==MAKEFOURCC('a','l','a','c'))) { - if (qtmovie->stream->ci->id3->codectype!=AFMT_ALAC) { + if (qtmovie->stream->ci->id3->codectype!=AFMT_MP4_ALAC) { return false; } @@ -254,7 +254,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) stream_skip(qtmovie->stream, entry_remaining); } else if (qtmovie->res->format==MAKEFOURCC('m','p','4','a')) { - if (qtmovie->stream->ci->id3->codectype!=AFMT_AAC) { + if (qtmovie->stream->ci->id3->codectype!=AFMT_MP4_AAC) { return false; } 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] = [AFMT_WAVPACK] = AFMT_ENTRY("WV", "wavpack", "wavpack_enc", "wv\0" ), /* Apple Lossless Audio Codec */ - [AFMT_ALAC] = + [AFMT_MP4_ALAC] = AFMT_ENTRY("ALAC", "alac", NULL, "m4a\0m4b\0" ), /* Advanced Audio Coding in M4A container */ - [AFMT_AAC] = + [AFMT_MP4_AAC] = AFMT_ENTRY("AAC", "aac", NULL, "mp4\0" ), /* Shorten */ [AFMT_SHN] = @@ -116,10 +116,10 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] = [AFMT_SAP] = AFMT_ENTRY("SAP", "asap", NULL, "sap\0" ), /* Cook in RM/RA */ - [AFMT_COOK] = + [AFMT_RM_COOK] = AFMT_ENTRY("Cook", "cook", NULL, "rm\0ra\0rmvb\0" ), /* AAC in RM/RA */ - [AFMT_RAAC] = + [AFMT_RM_AAC] = AFMT_ENTRY("RAAC", "raac", NULL, "rm\0ra\0rmvb\0" ), #endif }; @@ -296,8 +296,8 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname) break; - case AFMT_ALAC: - case AFMT_AAC: + case AFMT_MP4_ALAC: + case AFMT_MP4_AAC: if (!get_mp4_metadata(fd, id3)) { return false; @@ -379,7 +379,7 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname) id3->genre_string = id3_get_num_genre(36); break; - case AFMT_COOK: + case AFMT_RM_COOK: if (!get_rm_metadata(fd, id3)) { 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 AFMT_MPC, /* Musepack */ AFMT_A52, /* A/52 (aka AC3) audio */ AFMT_WAVPACK, /* WavPack */ - AFMT_ALAC, /* Apple Lossless Audio Codec */ - AFMT_AAC, /* Advanced Audio Coding (AAC) in M4A container */ + AFMT_MP4_ALAC, /* Apple Lossless Audio Codec */ + AFMT_MP4_AAC, /* Advanced Audio Coding (AAC) in M4A container */ AFMT_SHN, /* Shorten */ AFMT_SID, /* SID File Format */ AFMT_ADX, /* ADX File Format */ @@ -61,8 +61,8 @@ enum AFMT_WMA, /* WMAV1/V2 in ASF */ AFMT_MOD, /* Amiga MOD File Format */ AFMT_SAP, /* Amiga 8Bit SAP Format */ - AFMT_COOK, /* Cook in RM/RA */ - AFMT_RAAC, /* AAC in RM/RA */ + AFMT_RM_COOK, /* Cook in RM/RA */ + AFMT_RM_AAC, /* AAC in RM/RA */ #endif /* 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, { uint32_t frequency; - id3->codectype = (type == MP4_mp4a) ? AFMT_AAC : AFMT_ALAC; + id3->codectype = (type == MP4_mp4a) ? AFMT_MP4_AAC : AFMT_MP4_ALAC; lseek(fd, 22, SEEK_CUR); read_uint32be(fd, &frequency); 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) /* Already set, do nothing */ break; case aac: - id3->codectype = AFMT_RAAC; + id3->codectype = AFMT_RM_AAC; break; } 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) case AFMT_FLAC: case AFMT_PCM_WAV: case AFMT_A52: - case AFMT_AAC: + case AFMT_MP4_AAC: case AFMT_MPC: case AFMT_APE: case AFMT_WMA: -- cgit v1.2.3