summaryrefslogtreecommitdiff
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.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)
529 529
530 advance_buffer(src,12); 530 advance_buffer(src,12);
531 consumed += 12; 531 consumed += 12;
532 if (rmctx->codec_type == cook) { 532 if (rmctx->codec_type == CODEC_COOK) {
533 for(x = 0 ; x < w/sps; x++) 533 for(x = 0 ; x < w/sps; x++)
534 { 534 {
535 place = sps*(h*x+((h+1)/2)*(y&1)+(y>>1)); 535 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)
538 consumed += sps; 538 consumed += sps;
539 } 539 }
540 } 540 }
541 else if (rmctx->codec_type == aac) { 541 else if (rmctx->codec_type == CODEC_AAC) {
542 rmctx->sub_packet_cnt = (get_uint16be(*src) & 0xf0) >> 4; 542 rmctx->sub_packet_cnt = (get_uint16be(*src) & 0xf0) >> 4;
543 advance_buffer(src, 2); 543 advance_buffer(src, 2);
544 consumed += 2; 544 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 @@
26 26
27#define MAX_EXTRADATA_SIZE 16 27#define MAX_EXTRADATA_SIZE 16
28 28
29enum codecs{cook, aac}; 29enum codecs{CODEC_COOK, CODEC_AAC};
30typedef struct rm_packet 30typedef struct rm_packet
31{ 31{
32 uint8_t *frames[100]; /* Pointers to ordered audio frames in buffer */ 32 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)
166 skipped += rmctx->extradata_size; 166 skipped += rmctx->extradata_size;
167 switch(fourcc) { 167 switch(fourcc) {
168 case FOURCC('c','o','o','k'): 168 case FOURCC('c','o','o','k'):
169 rmctx->codec_type = cook; 169 rmctx->codec_type = CODEC_COOK;
170 break; 170 break;
171 171
172 case FOURCC('r','a','a','c'): 172 case FOURCC('r','a','a','c'):
173 case FOURCC('r','a','c','p'): 173 case FOURCC('r','a','c','p'):
174 rmctx->codec_type = aac; 174 rmctx->codec_type = CODEC_AAC;
175 break; 175 break;
176 176
177 default: /* Not a supported codec */ 177 default: /* Not a supported codec */
@@ -188,7 +188,7 @@ static inline int real_read_audio_stream_info(int fd, RMContext *rmctx)
188 DEBUGF(" fourcc = %s\n",fourcc2str(fourcc)); 188 DEBUGF(" fourcc = %s\n",fourcc2str(fourcc));
189 DEBUGF(" codec_extra_data_length = %ld\n",rmctx->extradata_size); 189 DEBUGF(" codec_extra_data_length = %ld\n",rmctx->extradata_size);
190 DEBUGF(" codec_extradata :\n"); 190 DEBUGF(" codec_extradata :\n");
191 if(rmctx->codec_type == cook) { 191 if(rmctx->codec_type == CODEC_COOK) {
192 DEBUGF(" cook_extradata :\n"); 192 DEBUGF(" cook_extradata :\n");
193 print_cook_extradata(rmctx); 193 print_cook_extradata(rmctx);
194 } 194 }
@@ -401,10 +401,10 @@ bool get_rm_metadata(int fd, struct mp3entry* id3)
401 401
402 switch(rmctx->codec_type) 402 switch(rmctx->codec_type)
403 { 403 {
404 case cook: 404 case CODEC_COOK:
405 /* Already set, do nothing */ 405 /* Already set, do nothing */
406 break; 406 break;
407 case aac: 407 case CODEC_AAC:
408 id3->codectype = AFMT_RM_AAC; 408 id3->codectype = AFMT_RM_AAC;
409 break; 409 break;
410 } 410 }