1
0
Fork 0
forked from len0rd/rockbox

Previous track button should work a little better.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6602 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-06-07 21:51:29 +00:00
parent b15e546937
commit f472410d57

View file

@ -296,13 +296,10 @@ int mp3_get_file_pos(void);
off_t codec_mp3_get_filepos_callback(int newtime) off_t codec_mp3_get_filepos_callback(int newtime)
{ {
int oldtime;
off_t newpos; off_t newpos;
oldtime = cur_ti->id3.elapsed;
cur_ti->id3.elapsed = newtime; cur_ti->id3.elapsed = newtime;
newpos = mp3_get_file_pos(); newpos = mp3_get_file_pos();
cur_ti->id3.elapsed = oldtime;
return newpos; return newpos;
} }
@ -360,7 +357,11 @@ int probe_file_format(const char *filename)
return AFMT_UNKNOWN; return AFMT_UNKNOWN;
suffix += 1; suffix += 1;
if (!strcmp("mp3", suffix)) if (!strcmp("mp1", suffix))
return AFMT_MPA_L1;
else if (!strcmp("mp2", suffix))
return AFMT_MPA_L2;
else if (!strcmp("mp3", suffix))
return AFMT_MPA_L3; return AFMT_MPA_L3;
else if (!strcmp("ogg", suffix)) else if (!strcmp("ogg", suffix))
return AFMT_OGG_VORBIS; return AFMT_OGG_VORBIS;
@ -770,10 +771,11 @@ void audio_update_trackinfo(void)
} else { } else {
buf_ridx -= ci.curpos; buf_ridx -= ci.curpos;
codecbufused += ci.curpos; codecbufused += ci.curpos;
cur_ti->available = cur_ti->filesize;
cur_ti = &tracks[track_ridx]; cur_ti = &tracks[track_ridx];
buf_ridx -= cur_ti->filesize; buf_ridx -= cur_ti->filesize + cur_ti->codecsize;
buf_ridx -= cur_ti->codecsize; codecbufused += cur_ti->filesize + cur_ti->codecsize;
cur_ti->available = cur_ti->filesize; cur_ti->available = cur_ti->filesize;
if (buf_ridx < 0) if (buf_ridx < 0)
buf_ridx = codecbuflen + buf_ridx; buf_ridx = codecbuflen + buf_ridx;