diff options
-rw-r--r-- | apps/playback.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/playback.c b/apps/playback.c index d600fff667..1593b586fa 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -296,13 +296,10 @@ int mp3_get_file_pos(void); | |||
296 | 296 | ||
297 | off_t codec_mp3_get_filepos_callback(int newtime) | 297 | off_t codec_mp3_get_filepos_callback(int newtime) |
298 | { | 298 | { |
299 | int oldtime; | ||
300 | off_t newpos; | 299 | off_t newpos; |
301 | 300 | ||
302 | oldtime = cur_ti->id3.elapsed; | ||
303 | cur_ti->id3.elapsed = newtime; | 301 | cur_ti->id3.elapsed = newtime; |
304 | newpos = mp3_get_file_pos(); | 302 | newpos = mp3_get_file_pos(); |
305 | cur_ti->id3.elapsed = oldtime; | ||
306 | 303 | ||
307 | return newpos; | 304 | return newpos; |
308 | } | 305 | } |
@@ -360,7 +357,11 @@ int probe_file_format(const char *filename) | |||
360 | return AFMT_UNKNOWN; | 357 | return AFMT_UNKNOWN; |
361 | suffix += 1; | 358 | suffix += 1; |
362 | 359 | ||
363 | if (!strcmp("mp3", suffix)) | 360 | if (!strcmp("mp1", suffix)) |
361 | return AFMT_MPA_L1; | ||
362 | else if (!strcmp("mp2", suffix)) | ||
363 | return AFMT_MPA_L2; | ||
364 | else if (!strcmp("mp3", suffix)) | ||
364 | return AFMT_MPA_L3; | 365 | return AFMT_MPA_L3; |
365 | else if (!strcmp("ogg", suffix)) | 366 | else if (!strcmp("ogg", suffix)) |
366 | return AFMT_OGG_VORBIS; | 367 | return AFMT_OGG_VORBIS; |
@@ -770,10 +771,11 @@ void audio_update_trackinfo(void) | |||
770 | } else { | 771 | } else { |
771 | buf_ridx -= ci.curpos; | 772 | buf_ridx -= ci.curpos; |
772 | codecbufused += ci.curpos; | 773 | codecbufused += ci.curpos; |
774 | cur_ti->available = cur_ti->filesize; | ||
773 | 775 | ||
774 | cur_ti = &tracks[track_ridx]; | 776 | cur_ti = &tracks[track_ridx]; |
775 | buf_ridx -= cur_ti->filesize; | 777 | buf_ridx -= cur_ti->filesize + cur_ti->codecsize; |
776 | buf_ridx -= cur_ti->codecsize; | 778 | codecbufused += cur_ti->filesize + cur_ti->codecsize; |
777 | cur_ti->available = cur_ti->filesize; | 779 | cur_ti->available = cur_ti->filesize; |
778 | if (buf_ridx < 0) | 780 | if (buf_ridx < 0) |
779 | buf_ridx = codecbuflen + buf_ridx; | 781 | buf_ridx = codecbuflen + buf_ridx; |