len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FS#11175. playlist_peek() wasn't thread safe (due to a static filename buffer), so frequent calls from the main thread would cause the audio thread to buffer the wrong track.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27773 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2010-08-11 19:01:50 +00:00
parent de44ae7efc
commit 113764d9c0
5 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/tree.c
View file

@ -1075,6 +1075,7 @@ bool bookmark_play(char *resume_file, int index, int offset, int seed,
lastdir[0]='\0';
if (playlist_create(resume_file, NULL) != -1)
{
char filename_buf[MAX_PATH + 1];
const char* peek_filename;
resume_directory(resume_file);
if (global_settings.playlist_shuffle)
@ -1082,13 +1083,15 @@ bool bookmark_play(char *resume_file, int index, int offset, int seed,
/* Check if the file is at the same spot in the directory,
else search for it */
peek_filename = playlist_peek(index);
peek_filename = playlist_peek(index, filename_buf,
sizeof(filename_buf));
if (peek_filename == NULL)
{
/* playlist has shrunk, search from the top */
index = 0;
peek_filename = playlist_peek(index);
peek_filename = playlist_peek(index, filename_buf,
sizeof(filename_buf));
if (peek_filename == NULL)
return false;
}
@ -1097,7 +1100,8 @@ bool bookmark_play(char *resume_file, int index, int offset, int seed,
{
for ( i=0; i < playlist_amount(); i++ )
{
peek_filename = playlist_peek(i);
peek_filename = playlist_peek(i, filename_buf,
sizeof(filename_buf));
if (peek_filename == NULL)
return false;