summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2009-08-04 06:10:03 +0000
committerMohamed Tarek <mt@rockbox.org>2009-08-04 06:10:03 +0000
commit3c58b261528d9590f7c09e220c57feb152b86ad4 (patch)
treef8946f7ad0f5fa653432caa1f24443ab15b35b7f
parentc2480c33f7a11ad0f6188afdda7e29e433e91844 (diff)
downloadrockbox-3c58b261528d9590f7c09e220c57feb152b86ad4.tar.gz
rockbox-3c58b261528d9590f7c09e220c57feb152b86ad4.zip
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
-rw-r--r--apps/codecs/cook.c2
-rw-r--r--apps/codecs/librm/rm.h2
-rw-r--r--apps/codecs/raac.c4
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 @@
24#include "inttypes.h" 24#include "inttypes.h"
25#include "libcook/cook.h" 25#include "libcook/cook.h"
26 26
27#define DATA_HEADER_SIZE 18 /* size of DATA chunk header in a rm file */
28
29CODEC_HEADER 27CODEC_HEADER
30 28
31RMContext rmctx; 29RMContext 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 @@
25#include <inttypes.h> 25#include <inttypes.h>
26 26
27#define MAX_EXTRADATA_SIZE 16 27#define MAX_EXTRADATA_SIZE 16
28#define DATA_HEADER_SIZE 18
29#define PACKET_HEADER_SIZE 12
28 30
29enum codecs{CODEC_COOK, CODEC_AAC}; 31enum codecs{CODEC_COOK, CODEC_AAC};
30typedef struct rm_packet 32typedef 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 @@
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/ 7 * \/ \/ \/ \/ \/
8 * $Id: aac.c 19743 2009-01-10 21:10:56Z zagor $ 8 * $Id:$
9 * 9 *
10 * Copyright (C) 2009 Mohamed Tarek 10 * Copyright (C) 2009 Mohamed Tarek
11 * 11 *
@@ -27,7 +27,7 @@
27#include "libfaad/output.h" 27#include "libfaad/output.h"
28 28
29CODEC_HEADER 29CODEC_HEADER
30#define DATA_HEADER_SIZE 18 30
31static void init_rm(RMContext *rmctx) 31static void init_rm(RMContext *rmctx)
32{ 32{
33 memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext)); 33 memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext));