From d34865a5307e7bf91d986036797423975ac828b4 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Tue, 5 Apr 2005 11:33:58 +0000 Subject: mp3buf renamed to audiobuf git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6252 a1c6a512-1295-4272-9138-f99709370657 --- firmware/mp3data.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'firmware/mp3data.c') 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) { if(fnf_read_index < fnf_buf_len) { - *c = mp3buf[fnf_read_index++]; + *c = audiobuf[fnf_read_index++]; return 1; } else { - fnf_buf_len = read(fd, mp3buf, mp3end - mp3buf); + fnf_buf_len = read(fd, audiobuf, audiobufend - audiobuf); if(fnf_buf_len < 0) return -1; @@ -286,7 +286,7 @@ static int buf_getbyte(int fd, unsigned char *c) if(fnf_buf_len > 0) { - *c = mp3buf[fnf_read_index++]; + *c = audiobuf[fnf_read_index++]; return 1; } else @@ -302,7 +302,7 @@ static int buf_seek(int fd, int len) { len = fnf_read_index - fnf_buf_len; - fnf_buf_len = read(fd, mp3buf, mp3end - mp3buf); + fnf_buf_len = read(fd, audiobuf, audiobufend - audiobuf); if(fnf_buf_len < 0) return -1; @@ -330,7 +330,7 @@ unsigned long buf_find_next_frame(int fd, long *offset, long max_offset, return __find_next_frame(fd, offset, max_offset, last_header, buf_getbyte); } -static int mp3buflen; +static int audiobuflen; static int mem_pos; static int mem_cnt; static int mem_maxlen; @@ -339,8 +339,8 @@ static int mem_getbyte(int dummy, unsigned char *c) { dummy = dummy; - *c = mp3buf[mem_pos++]; - if(mem_pos >= mp3buflen) + *c = audiobuf[mem_pos++]; + if(mem_pos >= audiobuflen) mem_pos = 0; if(mem_cnt++ >= mem_maxlen) @@ -352,7 +352,7 @@ static int mem_getbyte(int dummy, unsigned char *c) unsigned long mem_find_next_frame(int startpos, long *offset, long max_offset, unsigned long last_header) { - mp3buflen = mp3end - mp3buf; + audiobuflen = audiobufend - audiobuf; mem_pos = startpos; mem_cnt = 0; mem_maxlen = max_offset; -- cgit v1.2.3