diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-05 07:25:55 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-05 07:25:55 +0000 |
commit | aa30f0483be326d44a6a50bd4d4eabcbe6b5ae8c (patch) | |
tree | bea5f8778f55827492538487a6f9c346acc55ee8 /apps | |
parent | 72550d94b6688fa2b00bcf5fb759a1b9adfcad34 (diff) | |
download | rockbox-aa30f0483be326d44a6a50bd4d4eabcbe6b5ae8c.tar.gz rockbox-aa30f0483be326d44a6a50bd4d4eabcbe6b5ae8c.zip |
Fixed crossfading.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7022 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playback.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/playback.c b/apps/playback.c index 7565cbcdf5..62fa8de854 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -873,6 +873,7 @@ bool audio_load_track(int offset, bool start_play, int peek_offset) | |||
873 | return false; | 873 | return false; |
874 | } | 874 | } |
875 | } | 875 | } |
876 | tracks[track_widx].id3.elapsed = 0; | ||
876 | 877 | ||
877 | /* Starting playback from an offset is only support in MPA at the moment */ | 878 | /* Starting playback from an offset is only support in MPA at the moment */ |
878 | if (offset > 0) { | 879 | if (offset > 0) { |
@@ -1157,7 +1158,7 @@ void audio_update_trackinfo(void) | |||
1157 | if (buf_ridx < 0) | 1158 | if (buf_ridx < 0) |
1158 | buf_ridx = codecbuflen + buf_ridx; | 1159 | buf_ridx = codecbuflen + buf_ridx; |
1159 | } | 1160 | } |
1160 | 1161 | ||
1161 | ci.filesize = cur_ti->filesize; | 1162 | ci.filesize = cur_ti->filesize; |
1162 | cur_ti->id3.elapsed = 0; | 1163 | cur_ti->id3.elapsed = 0; |
1163 | cur_ti->id3.offset = 0; | 1164 | cur_ti->id3.offset = 0; |
@@ -1436,7 +1437,7 @@ void codec_thread(void) | |||
1436 | 1437 | ||
1437 | struct mp3entry* audio_current_track(void) | 1438 | struct mp3entry* audio_current_track(void) |
1438 | { | 1439 | { |
1439 | logf("audio_current_track"); | 1440 | // logf("audio_current_track"); |
1440 | 1441 | ||
1441 | if (track_count > 0 && cur_ti->taginfo_ready) | 1442 | if (track_count > 0 && cur_ti->taginfo_ready) |
1442 | return (struct mp3entry *)&cur_ti->id3; | 1443 | return (struct mp3entry *)&cur_ti->id3; |
@@ -1515,7 +1516,7 @@ void audio_resume(void) | |||
1515 | static void initiate_track_change(int peek_index) | 1516 | static void initiate_track_change(int peek_index) |
1516 | { | 1517 | { |
1517 | if (!playlist_check(peek_index)) | 1518 | if (!playlist_check(peek_index)) |
1518 | return ; | 1519 | return ; |
1519 | 1520 | ||
1520 | new_track = peek_index; | 1521 | new_track = peek_index; |
1521 | ci.reload_codec = true; | 1522 | ci.reload_codec = true; |