devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fixed problem with auto change directory not working when browsing plugins

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9715 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Hardeep Sidhu 2006-04-18 16:24:12 +00:00
parent cf6ad10b9f
commit d0de1aafac
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/playlist.c
View file

@ -688,17 +688,17 @@ static int add_directory_to_playlist(struct playlist_info* playlist,
int result = 0; int result = 0;
int num_files = 0; int num_files = 0;
int i; int i;
int dirfilter = global_settings.dirfilter;
struct entry *files; struct entry *files;
struct tree_context* tc = tree_get_context(); struct tree_context* tc = tree_get_context();
int dirfilter = *(tc->dirfilter);
/* use the tree browser dircache to load files */ /* use the tree browser dircache to load files */
global_settings.dirfilter = SHOW_ALL; *(tc->dirfilter) = SHOW_ALL;
if (ft_load(tc, dirname) < 0) if (ft_load(tc, dirname) < 0)
{ {
gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR));
global_settings.dirfilter = dirfilter; *(tc->dirfilter) = dirfilter;
return -1; return -1;
} }
@ -788,7 +788,7 @@ static int add_directory_to_playlist(struct playlist_info* playlist,
} }
/* restore dirfilter */ /* restore dirfilter */
global_settings.dirfilter = dirfilter; *(tc->dirfilter) = dirfilter;
return result; return result;
} }
@ -1349,11 +1349,11 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
{ {
struct playlist_info* playlist = &current_playlist; struct playlist_info* playlist = &current_playlist;
int result = -1; int result = -1;
int dirfilter = global_settings.dirfilter;
int sort_dir = global_settings.sort_dir; int sort_dir = global_settings.sort_dir;
char *start_dir = NULL; char *start_dir = NULL;
bool exit = false; bool exit = false;
struct tree_context* tc = tree_get_context(); struct tree_context* tc = tree_get_context();
int dirfilter = *(tc->dirfilter);
if (recursion){ if (recursion){
/* start with root */ /* start with root */
@ -1366,7 +1366,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
} }
/* use the tree browser dircache to load files */ /* use the tree browser dircache to load files */
global_settings.dirfilter = SHOW_ALL; *(tc->dirfilter) = SHOW_ALL;
/* sort in another direction if previous dir is requested */ /* sort in another direction if previous dir is requested */
if(!is_forward){ if(!is_forward){
@ -1443,7 +1443,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
reload_directory(); reload_directory();
/* restore dirfilter & sort_dir */ /* restore dirfilter & sort_dir */
global_settings.dirfilter = dirfilter; *(tc->dirfilter) = dirfilter;
global_settings.sort_dir = sort_dir; global_settings.sort_dir = sort_dir;
/* special case if nothing found: try start searching again from root */ /* special case if nothing found: try start searching again from root */