devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Another strike in the battle against glitches between tracks

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2325 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-09-18 13:51:08 +00:00
parent 3375f3563a
commit b3bb076085
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
firmware/mpeg.c
View file

@ -697,7 +697,7 @@ static int new_file(int steps)
{ {
/* skip past id3v2 tag (to an even byte) */ /* skip past id3v2 tag (to an even byte) */
lseek(mpeg_file, lseek(mpeg_file,
id3tags[new_tag_idx]->id3.id3v2len & ~1, id3tags[new_tag_idx]->id3.id3v2len,
SEEK_SET); SEEK_SET);
id3tags[new_tag_idx]->id3.index = steps; id3tags[new_tag_idx]->id3.index = steps;
id3tags[new_tag_idx]->id3.offset = 0; id3tags[new_tag_idx]->id3.offset = 0;
@ -743,6 +743,23 @@ static void track_change(void)
update_playlist(); update_playlist();
} }
#ifdef DEBUG
void hexdump(unsigned char *buf, int len)
{
int i;
for(i = 0;i < len;i++)
{
if(i && (i & 15) == 0)
{
DEBUGF("\n");
}
DEBUGF("%02x ", buf[i]);
}
DEBUGF("\n");
}
#endif
static void mpeg_thread(void) static void mpeg_thread(void)
{ {
static int pause_tick = 0; static int pause_tick = 0;
@ -1239,13 +1256,17 @@ static void mpeg_thread(void)
boundary when we reach the end of the file */ boundary when we reach the end of the file */
if (len < amount_to_read) { if (len < amount_to_read) {
/* Skip id3v1 tag */ /* Skip id3v1 tag */
DEBUGF("Skipping ID3v1 tag\n");
len -= id3tags[tag_read_idx]->id3.id3v1len; len -= id3tags[tag_read_idx]->id3.id3v1len;
/* The very rare case when the buffer wrapped
inside the tag must be taken care of */
if(len < 0) if(len < 0)
len = 0; len = 0;
len = (len + 1) & 0xfffffffe; len = (len + 1) & 0xfffffffe;
} }
mp3buf_write += len; mp3buf_write += len;
if(mp3buf_write >= mp3buflen) if(mp3buf_write >= mp3buflen)
{ {
mp3buf_write = 0; mp3buf_write = 0;