diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-05-09 09:36:58 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-05-09 09:36:58 +0000 |
commit | 30c338a4c156bbe7b26fe7942dbd789518fd7818 (patch) | |
tree | 10542dc8a4679bbe0585c45867a1959cfd0433f1 /firmware/mpeg.c | |
parent | 3eb82028d15d5545ea119f5f774c150706eca941 (diff) | |
download | rockbox-30c338a4c156bbe7b26fe7942dbd789518fd7818.tar.gz rockbox-30c338a4c156bbe7b26fe7942dbd789518fd7818.zip |
Prevent spurious bitswapping of the mp3 buffer: stop_playing() now calls reset_mp3_buffer() and so makes sure the bitswap ends. (This was the reason for the failing voice UI after playback!) I also removed a few lines of redundant code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4597 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r-- | firmware/mpeg.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index bf0512dfc2..296ef1440d 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -821,6 +821,7 @@ static void stop_playing(void) | |||
821 | close(mpeg_file); | 821 | close(mpeg_file); |
822 | mpeg_file = -1; | 822 | mpeg_file = -1; |
823 | remove_all_tags(); | 823 | remove_all_tags(); |
824 | reset_mp3_buffer(); | ||
824 | } | 825 | } |
825 | 826 | ||
826 | static void update_playlist(void) | 827 | static void update_playlist(void) |
@@ -2042,14 +2043,6 @@ static void init_recording(void) | |||
2042 | is_playing = false; | 2043 | is_playing = false; |
2043 | paused = false; | 2044 | paused = false; |
2044 | 2045 | ||
2045 | reset_mp3_buffer(); | ||
2046 | |||
2047 | remove_all_tags(); | ||
2048 | |||
2049 | if(mpeg_file >= 0) | ||
2050 | close(mpeg_file); | ||
2051 | mpeg_file = -1; | ||
2052 | |||
2053 | /* Init the recording variables */ | 2046 | /* Init the recording variables */ |
2054 | is_recording = false; | 2047 | is_recording = false; |
2055 | is_prerecording = false; | 2048 | is_prerecording = false; |