summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-06-09 21:21:33 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-06-09 21:21:33 +0000
commitc2bf1360ad70ce4965457b9c5ae8afa345eb664e (patch)
tree1a5e260cc589dfd1a7991084e932390414011b8a
parentc0f74483844e57500097168166a302cc9c366002 (diff)
downloadrockbox-c2bf1360ad70ce4965457b9c5ae8afa345eb664e.tar.gz
rockbox-c2bf1360ad70ce4965457b9c5ae8afa345eb664e.zip
Fixed problem that same track gets buffered twice after buffer
re-filling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6645 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 19f2bc3ad3..91f930540d 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -770,9 +770,8 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
770 return true; 770 return true;
771} 771}
772 772
773void audio_insert_tracks(int offset, bool start_playing) 773void audio_insert_tracks(int offset, bool start_playing, int peek_offset)
774{ 774{
775 int peek_offset = 0;
776 fill_bytesleft = codecbuflen - codecbufused; 775 fill_bytesleft = codecbuflen - codecbufused;
777 filling = true; 776 filling = true;
778 while (audio_load_track(offset, start_playing, peek_offset)) { 777 while (audio_load_track(offset, start_playing, peek_offset)) {
@@ -796,7 +795,7 @@ void audio_play_start(int offset)
796#ifndef SIMULATOR 795#ifndef SIMULATOR
797 pcm_set_boost_mode(true); 796 pcm_set_boost_mode(true);
798#endif 797#endif
799 audio_insert_tracks(offset, true); 798 audio_insert_tracks(offset, true, 0);
800#ifndef SIMULATOR 799#ifndef SIMULATOR
801 pcm_set_boost_mode(false); 800 pcm_set_boost_mode(false);
802 ata_sleep(); 801 ata_sleep();
@@ -855,7 +854,7 @@ void audio_check_buffer(void)
855 854
856 /* Load new files to fill the entire buffer. */ 855 /* Load new files to fill the entire buffer. */
857 if (tracks[track_widx].filerem == 0) 856 if (tracks[track_widx].filerem == 0)
858 audio_insert_tracks(0, false); 857 audio_insert_tracks(0, false, 1);
859 858
860#ifndef SIMULATOR 859#ifndef SIMULATOR
861 pcm_set_boost_mode(false); 860 pcm_set_boost_mode(false);