From 3c58b261528d9590f7c09e220c57feb152b86ad4 Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Tue, 4 Aug 2009 06:10:03 +0000 Subject: Move the DATA_HEADER_SIZE define to codecs/librm/rm.h and add a define for PACKET_HEADER_SIZE. No functional changes. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22152 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/cook.c | 2 -- apps/codecs/librm/rm.h | 2 ++ apps/codecs/raac.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/codecs/cook.c b/apps/codecs/cook.c index ec30b3e6bc..c9039a480c 100644 --- a/apps/codecs/cook.c +++ b/apps/codecs/cook.c @@ -24,8 +24,6 @@ #include "inttypes.h" #include "libcook/cook.h" -#define DATA_HEADER_SIZE 18 /* size of DATA chunk header in a rm file */ - CODEC_HEADER RMContext rmctx; diff --git a/apps/codecs/librm/rm.h b/apps/codecs/librm/rm.h index cd59cffc55..12e9b18fa3 100644 --- a/apps/codecs/librm/rm.h +++ b/apps/codecs/librm/rm.h @@ -25,6 +25,8 @@ #include #define MAX_EXTRADATA_SIZE 16 +#define DATA_HEADER_SIZE 18 +#define PACKET_HEADER_SIZE 12 enum codecs{CODEC_COOK, CODEC_AAC}; typedef struct rm_packet diff --git a/apps/codecs/raac.c b/apps/codecs/raac.c index cfc5b4a460..db113b3494 100644 --- a/apps/codecs/raac.c +++ b/apps/codecs/raac.c @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: aac.c 19743 2009-01-10 21:10:56Z zagor $ + * $Id:$ * * Copyright (C) 2009 Mohamed Tarek * @@ -27,7 +27,7 @@ #include "libfaad/output.h" CODEC_HEADER -#define DATA_HEADER_SIZE 18 + static void init_rm(RMContext *rmctx) { memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext)); -- cgit