summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2009-07-27 12:29:06 +0000
committerMohamed Tarek <mt@rockbox.org>2009-07-27 12:29:06 +0000
commitc08a2c7c53fcfc652bf2463986a447120f946b53 (patch)
tree67fc82439dd6e9b2021f772851b3a7940597bbe8
parent5f5d105755d93e22d283e00b07775a4d935522d3 (diff)
downloadrockbox-c08a2c7c53fcfc652bf2463986a447120f946b53.tar.gz
rockbox-c08a2c7c53fcfc652bf2463986a447120f946b53.tar.bz2
rockbox-c08a2c7c53fcfc652bf2463986a447120f946b53.zip
Change enum codecs in apps/codecs/librm/rm.h to follow the coding guidelines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22067 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/librm/rm.c4
-rw-r--r--apps/codecs/librm/rm.h2
-rw-r--r--apps/metadata/rm.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/codecs/librm/rm.c b/apps/codecs/librm/rm.c
index a48fb51cc6..c802a0c5a9 100644
--- a/apps/codecs/librm/rm.c
+++ b/apps/codecs/librm/rm.c
@@ -529,7 +529,7 @@ int rm_get_packet(uint8_t **src,RMContext *rmctx, RMPacket *pkt)
advance_buffer(src,12);
consumed += 12;
- if (rmctx->codec_type == cook) {
+ if (rmctx->codec_type == CODEC_COOK) {
for(x = 0 ; x < w/sps; x++)
{
place = sps*(h*x+((h+1)/2)*(y&1)+(y>>1));
@@ -538,7 +538,7 @@ int rm_get_packet(uint8_t **src,RMContext *rmctx, RMPacket *pkt)
consumed += sps;
}
}
- else if (rmctx->codec_type == aac) {
+ else if (rmctx->codec_type == CODEC_AAC) {
rmctx->sub_packet_cnt = (get_uint16be(*src) & 0xf0) >> 4;
advance_buffer(src, 2);
consumed += 2;
diff --git a/apps/codecs/librm/rm.h b/apps/codecs/librm/rm.h
index ee72c1fc04..cd59cffc55 100644
--- a/apps/codecs/librm/rm.h
+++ b/apps/codecs/librm/rm.h
@@ -26,7 +26,7 @@
#define MAX_EXTRADATA_SIZE 16
-enum codecs{cook, aac};
+enum codecs{CODEC_COOK, CODEC_AAC};
typedef struct rm_packet
{
uint8_t *frames[100]; /* Pointers to ordered audio frames in buffer */
diff --git a/apps/metadata/rm.c b/apps/metadata/rm.c
index 8a2583961a..4be0de647f 100644
--- a/apps/metadata/rm.c
+++ b/apps/metadata/rm.c
@@ -166,12 +166,12 @@ static inline int real_read_audio_stream_info(int fd, RMContext *rmctx)
skipped += rmctx->extradata_size;
switch(fourcc) {
case FOURCC('c','o','o','k'):
- rmctx->codec_type = cook;
+ rmctx->codec_type = CODEC_COOK;
break;
case FOURCC('r','a','a','c'):
case FOURCC('r','a','c','p'):
- rmctx->codec_type = aac;
+ rmctx->codec_type = CODEC_AAC;
break;
default: /* Not a supported codec */
@@ -188,7 +188,7 @@ static inline int real_read_audio_stream_info(int fd, RMContext *rmctx)
DEBUGF(" fourcc = %s\n",fourcc2str(fourcc));
DEBUGF(" codec_extra_data_length = %ld\n",rmctx->extradata_size);
DEBUGF(" codec_extradata :\n");
- if(rmctx->codec_type == cook) {
+ if(rmctx->codec_type == CODEC_COOK) {
DEBUGF(" cook_extradata :\n");
print_cook_extradata(rmctx);
}
@@ -401,10 +401,10 @@ bool get_rm_metadata(int fd, struct mp3entry* id3)
switch(rmctx->codec_type)
{
- case cook:
+ case CODEC_COOK:
/* Already set, do nothing */
break;
- case aac:
+ case CODEC_AAC:
id3->codectype = AFMT_RM_AAC;
break;
}