diff options
author | Hardeep Sidhu <dyp@pobox.com> | 2003-08-29 04:36:35 +0000 |
---|---|---|
committer | Hardeep Sidhu <dyp@pobox.com> | 2003-08-29 04:36:35 +0000 |
commit | 4160b75456bc42adaa0857bf62fa89f01ba951d2 (patch) | |
tree | 6df5ae025d188425b59ba6c36b91b9470484977e /firmware/mpeg.c | |
parent | 20ac4a281af78077ce56271e11d11e151fe9cd3e (diff) | |
download | rockbox-4160b75456bc42adaa0857bf62fa89f01ba951d2.tar.gz rockbox-4160b75456bc42adaa0857bf62fa89f01ba951d2.zip |
Pass actual time instead of offset to mpeg_ff_rewind. Fixes ff/rew to wrong time when mpeg thread is busy loading data.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3943 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r-- | firmware/mpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index ec5a8b3684..347e8ded21 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -1497,7 +1497,7 @@ static void mpeg_thread(void) | |||
1497 | case MPEG_FF_REWIND: { | 1497 | case MPEG_FF_REWIND: { |
1498 | struct mp3entry *id3 = mpeg_current_track(); | 1498 | struct mp3entry *id3 = mpeg_current_track(); |
1499 | unsigned int oldtime = id3->elapsed; | 1499 | unsigned int oldtime = id3->elapsed; |
1500 | unsigned int newtime = oldtime + (int)ev.data; | 1500 | unsigned int newtime = (unsigned int)ev.data; |
1501 | int curpos, newpos, diffpos; | 1501 | int curpos, newpos, diffpos; |
1502 | DEBUGF("MPEG_FF_REWIND\n"); | 1502 | DEBUGF("MPEG_FF_REWIND\n"); |
1503 | 1503 | ||
@@ -2450,12 +2450,12 @@ void mpeg_prev(void) | |||
2450 | #endif | 2450 | #endif |
2451 | } | 2451 | } |
2452 | 2452 | ||
2453 | void mpeg_ff_rewind(int change) | 2453 | void mpeg_ff_rewind(int newtime) |
2454 | { | 2454 | { |
2455 | #ifndef SIMULATOR | 2455 | #ifndef SIMULATOR |
2456 | queue_post(&mpeg_queue, MPEG_FF_REWIND, (void *)change); | 2456 | queue_post(&mpeg_queue, MPEG_FF_REWIND, (void *)newtime); |
2457 | #else | 2457 | #else |
2458 | (void)change; | 2458 | (void)newtime; |
2459 | #endif | 2459 | #endif |
2460 | } | 2460 | } |
2461 | 2461 | ||