diff options
author | Hardeep Sidhu <dyp@pobox.com> | 2003-06-25 15:17:04 +0000 |
---|---|---|
committer | Hardeep Sidhu <dyp@pobox.com> | 2003-06-25 15:17:04 +0000 |
commit | df34e6b71a04c70ecd1164341bdd1c58477e697f (patch) | |
tree | e776af3b817d6fd83a5dc195fe0c787241274156 /firmware | |
parent | b88f2bc9b11ed54aae6bfb1affadf28e435ab736 (diff) | |
download | rockbox-df34e6b71a04c70ecd1164341bdd1c58477e697f.tar.gz rockbox-df34e6b71a04c70ecd1164341bdd1c58477e697f.zip |
In flush_reload, don't reset swapwrite if we're still swapping current track. Fixes a silent play bug.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3760 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/mpeg.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 11f7e60f16..57234fc886 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -1675,7 +1675,12 @@ static void mpeg_thread(void) | |||
1675 | int next = (tag_read_idx+1) & MAX_ID3_TAGS_MASK; | 1675 | int next = (tag_read_idx+1) & MAX_ID3_TAGS_MASK; |
1676 | 1676 | ||
1677 | /* Reset the buffer */ | 1677 | /* Reset the buffer */ |
1678 | mp3buf_write = mp3buf_swapwrite = id3tags[next]->mempos; | 1678 | mp3buf_write = id3tags[next]->mempos; |
1679 | |||
1680 | /* Reset swapwrite unless we're still swapping current | ||
1681 | track */ | ||
1682 | if (get_unplayed_space() <= get_playable_space()) | ||
1683 | mp3buf_swapwrite = mp3buf_write; | ||
1679 | 1684 | ||
1680 | close(mpeg_file); | 1685 | close(mpeg_file); |
1681 | remove_all_non_current_tags(); | 1686 | remove_all_non_current_tags(); |