summaryrefslogtreecommitdiff
path: root/firmware/mp3data.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-04-05 11:33:58 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-04-05 11:33:58 +0000
commitd34865a5307e7bf91d986036797423975ac828b4 (patch)
tree41dcc1775f6cdc1d655f1eddadaabdf90c7ac22f /firmware/mp3data.c
parent6cf9d51b3374cdc436c45f165a10f607832126ee (diff)
downloadrockbox-d34865a5307e7bf91d986036797423975ac828b4.tar.gz
rockbox-d34865a5307e7bf91d986036797423975ac828b4.zip
mp3buf renamed to audiobuf
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6252 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/mp3data.c')
-rw-r--r--firmware/mp3data.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/mp3data.c b/firmware/mp3data.c
index 7b6da1144f..7a8af34d56 100644
--- a/firmware/mp3data.c
+++ b/firmware/mp3data.c
@@ -273,12 +273,12 @@ static int buf_getbyte(int fd, unsigned char *c)
273{ 273{
274 if(fnf_read_index < fnf_buf_len) 274 if(fnf_read_index < fnf_buf_len)
275 { 275 {
276 *c = mp3buf[fnf_read_index++]; 276 *c = audiobuf[fnf_read_index++];
277 return 1; 277 return 1;
278 } 278 }
279 else 279 else
280 { 280 {
281 fnf_buf_len = read(fd, mp3buf, mp3end - mp3buf); 281 fnf_buf_len = read(fd, audiobuf, audiobufend - audiobuf);
282 if(fnf_buf_len < 0) 282 if(fnf_buf_len < 0)
283 return -1; 283 return -1;
284 284
@@ -286,7 +286,7 @@ static int buf_getbyte(int fd, unsigned char *c)
286 286
287 if(fnf_buf_len > 0) 287 if(fnf_buf_len > 0)
288 { 288 {
289 *c = mp3buf[fnf_read_index++]; 289 *c = audiobuf[fnf_read_index++];
290 return 1; 290 return 1;
291 } 291 }
292 else 292 else
@@ -302,7 +302,7 @@ static int buf_seek(int fd, int len)
302 { 302 {
303 len = fnf_read_index - fnf_buf_len; 303 len = fnf_read_index - fnf_buf_len;
304 304
305 fnf_buf_len = read(fd, mp3buf, mp3end - mp3buf); 305 fnf_buf_len = read(fd, audiobuf, audiobufend - audiobuf);
306 if(fnf_buf_len < 0) 306 if(fnf_buf_len < 0)
307 return -1; 307 return -1;
308 308
@@ -330,7 +330,7 @@ unsigned long buf_find_next_frame(int fd, long *offset, long max_offset,
330 return __find_next_frame(fd, offset, max_offset, last_header, buf_getbyte); 330 return __find_next_frame(fd, offset, max_offset, last_header, buf_getbyte);
331} 331}
332 332
333static int mp3buflen; 333static int audiobuflen;
334static int mem_pos; 334static int mem_pos;
335static int mem_cnt; 335static int mem_cnt;
336static int mem_maxlen; 336static int mem_maxlen;
@@ -339,8 +339,8 @@ static int mem_getbyte(int dummy, unsigned char *c)
339{ 339{
340 dummy = dummy; 340 dummy = dummy;
341 341
342 *c = mp3buf[mem_pos++]; 342 *c = audiobuf[mem_pos++];
343 if(mem_pos >= mp3buflen) 343 if(mem_pos >= audiobuflen)
344 mem_pos = 0; 344 mem_pos = 0;
345 345
346 if(mem_cnt++ >= mem_maxlen) 346 if(mem_cnt++ >= mem_maxlen)
@@ -352,7 +352,7 @@ static int mem_getbyte(int dummy, unsigned char *c)
352unsigned long mem_find_next_frame(int startpos, long *offset, long max_offset, 352unsigned long mem_find_next_frame(int startpos, long *offset, long max_offset,
353 unsigned long last_header) 353 unsigned long last_header)
354{ 354{
355 mp3buflen = mp3end - mp3buf; 355 audiobuflen = audiobufend - audiobuf;
356 mem_pos = startpos; 356 mem_pos = startpos;
357 mem_cnt = 0; 357 mem_cnt = 0;
358 mem_maxlen = max_offset; 358 mem_maxlen = max_offset;