Index: apps/playlist.c =================================================================== --- apps/playlist.c (revision 18740) +++ apps/playlist.c (working copy) @@ -1425,20 +1420,23 @@ { struct playlist_info* playlist = ¤t_playlist; int result = -1; - int sort_dir = global_settings.sort_dir; char *start_dir = NULL; bool exit = false; struct tree_context* tc = tree_get_context(); - int dirfilter = *(tc->dirfilter); + int saved_dirfilter = *(tc->dirfilter); + int saved_sort_dir = *(tc->sort_dir); + + /* process random folder advance */ if (global_settings.next_folder == FOLDER_ADVANCE_RANDOM) { int fd = open(ROCKBOX_DIR "/folder_advance_list.dat",O_RDONLY); - char buffer[MAX_PATH]; - int folder_count = 0,i; - srand(current_tick); - *(tc->dirfilter) = SHOW_MUSIC; if (fd >= 0) { + char buffer[MAX_PATH]; + int folder_count = 0,i; + srand(current_tick); + *(tc->dirfilter) = SHOW_MUSIC; + *(tc->sort_dir) = global_settings.sort_dir; read(fd,&folder_count,sizeof(int)); if (!folder_count) exit = true; @@ -1453,17 +1451,21 @@ if (folder_count) strcpy(dir,buffer); close(fd); - *(tc->dirfilter) = dirfilter; + *(tc->dirfilter) = saved_dirfilter; + *(tc->sort_dir) = saved_sort_dir; reload_directory(); return 0; } } - /* not random folder advance */ - if (recursion){ + + /* not random folder advance (or random folder advance unavailable) */ + if (recursion) + { /* start with root */ dir[0] = '\0'; } - else{ + else + { /* start with current directory */ strncpy(dir, playlist->filename, playlist->dirlen-1); dir[playlist->dirlen-1] = '\0'; @@ -1472,16 +1474,34 @@ /* use the tree browser dircache to load files */ *(tc->dirfilter) = SHOW_ALL; - /* sort in another direction if previous dir is requested */ - if(!is_forward){ - if ((global_settings.sort_dir == 0) || (global_settings.sort_dir == 3)) - global_settings.sort_dir = 4; - else if (global_settings.sort_dir == 1) - global_settings.sort_dir = 2; - else if (global_settings.sort_dir == 2) - global_settings.sort_dir = 1; - else if (global_settings.sort_dir == 4) - global_settings.sort_dir = 0; + /* set up sorting/direction */ + if (is_forward) + *(tc->sort_dir) = global_settings.sort_dir; + else + { + int new_sort_dir; + switch(global_settings.sort_dir) + { + case SORT_ALPHA: + new_sort_dir = SORT_ALPHA_REVERSED; + break; + case SORT_DATE: + new_sort_dir = SORT_DATE_REVERSED; + break; + case SORT_DATE_REVERSED: + new_sort_dir = SORT_DATE; + break; + case SORT_TYPE: + new_sort_dir = SORT_TYPE_REVERSED; + break; + case SORT_ALPHA_REVERSED: + new_sort_dir = SORT_ALPHA; + break; + case SORT_TYPE_REVERSED: + new_sort_dir = SORT_TYPE; + break; + } + *(tc->sort_dir) = new_sort_dir; } while (!exit) @@ -1542,14 +1562,13 @@ } } - /* restore dirfilter & sort_dir */ - *(tc->dirfilter) = dirfilter; - global_settings.sort_dir = sort_dir; + /* restore dirfilter */ + *(tc->dirfilter) = saved_dirfilter; + *(tc->sort_dir) = saved_sort_dir; /* special case if nothing found: try start searching again from root */ - if (result == -1 && !recursion){ - result = get_next_dir(dir,is_forward, true); - } + if (result == -1 && !recursion) + result = get_next_dir(dir, is_forward, true); return result; } Index: apps/tree.c =================================================================== --- apps/tree.c (revision 18740) +++ apps/tree.c (working copy) @@ -900,6 +895,7 @@ int ret_val = 0; int *last_filter = tc.dirfilter; tc.dirfilter = &dirfilter; + tc.sort_dir = &global_settings.sort_dir; reload_dir = true; if (dirfilter >= NUM_FILTER_MODES) @@ -940,6 +936,7 @@ /* initialize tree context struct */ memset(&tc, 0, sizeof(tc)); tc.dirfilter = &global_settings.dirfilter; + tc.sort_dir = &global_settings.sort_dir; tc.name_buffer_size = AVERAGE_FILENAME_LENGTH * max_files; tc.name_buffer = buffer_alloc(tc.name_buffer_size); Index: apps/tree.h =================================================================== --- apps/tree.h (revision 18740) +++ apps/tree.h (working copy) @@ -67,6 +67,7 @@ int name_buffer_size; int dentry_size; bool dirfull; + int *sort_dir; /* directory sort order */ }; void tree_mem_init(void); Index: apps/settings.h =================================================================== --- apps/settings.h (revision 18740) +++ apps/settings.h (working copy) @@ -139,6 +139,10 @@ NUM_FILTER_MODES, SHOW_WPS, SHOW_RWPS, SHOW_FMR, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS}; +/* file and dir sort options */ +enum { SORT_ALPHA, SORT_DATE, SORT_DATE_REVERSED, SORT_TYPE, /* available as settings */ + SORT_ALPHA_REVERSED, SORT_TYPE_REVERSED }; /* internal use only */ + /* recursive dir insert options */ enum { RECURSE_OFF, RECURSE_ON, RECURSE_ASK }; Index: apps/filetree.c =================================================================== --- apps/filetree.c (revision 18740) +++ apps/filetree.c (working copy) @@ -55,6 +55,8 @@ #include "backdrop.h" +static int compare_sort_dir; /* qsort key for sorting directories */ + int ft_build_playlist(struct tree_context* c, int start_index) { int i; @@ -188,14 +187,15 @@ int criteria; if (e1->attr & ATTR_DIRECTORY && e2->attr & ATTR_DIRECTORY) - { /* two directories */ - criteria = global_settings.sort_dir; + { + /* two directories */ + criteria = compare_sort_dir; #ifdef HAVE_MULTIVOLUME if (e1->attr & ATTR_VOLUME || e2->attr & ATTR_VOLUME) { /* a volume identifier is involved */ if (e1->attr & ATTR_VOLUME && e2->attr & ATTR_VOLUME) - criteria = 0; /* two volumes: sort alphabetically */ + criteria = SORT_ALPHA; /* two volumes: sort alphabetically */ else /* only one is a volume: volume first */ return (e2->attr & ATTR_VOLUME) - (e1->attr & ATTR_VOLUME); } @@ -203,7 +203,8 @@ } else if (!(e1->attr & ATTR_DIRECTORY) && !(e2->attr & ATTR_DIRECTORY)) - { /* two files */ + { + /* two files */ criteria = global_settings.sort_file; } else /* dir and file, dir goes first */ @@ -211,37 +212,37 @@ switch(criteria) { - case 3: /* sort type */ + case SORT_TYPE: + case SORT_TYPE_REVERSED: { int t1 = e1->attr & FILE_ATTR_MASK; int t2 = e2->attr & FILE_ATTR_MASK; - if (!t1) /* unknown type */ t1 = INT_MAX; /* gets a high number, to sort after known */ if (!t2) /* unknown type */ t2 = INT_MAX; /* gets a high number, to sort after known */ - if (t1 - t2) /* if different */ - return t1 - t2; + if (t1 != t2) /* if different */ + return (t1 - t2) * (criteria == SORT_TYPE_REVERSED ? -1 : 1); /* else fall through to alphabetical sorting */ } - case 0: /* sort alphabetically asc */ - if (global_settings.sort_case) - return strncmp(e1->name, e2->name, MAX_PATH); - else - return strncasecmp(e1->name, e2->name, MAX_PATH); - case 4: /* sort alphabetically desc */ + case SORT_DATE: + case SORT_DATE_REVERSED: + if (criteria == SORT_DATE || criteria == SORT_DATE_REVERSED) /* Ignore SORT_TYPE */ + { + if (e1->time_write != e2->time_write) + return (e1->time_write - e2->time_write) * (criteria == SORT_DATE_REVERSED ? -1 : 1); + /* else fall through to alphabetical sorting */ + } + + case SORT_ALPHA: + case SORT_ALPHA_REVERSED: if (global_settings.sort_case) - return strncmp(e2->name, e1->name, MAX_PATH); + return strncmp(e1->name, e2->name, MAX_PATH) * (criteria == SORT_ALPHA_REVERSED ? -1 : 1); else - return strncasecmp(e2->name, e1->name, MAX_PATH); + return strncasecmp(e1->name, e2->name, MAX_PATH) * (criteria == SORT_ALPHA_REVERSED ? -1 : 1); - case 1: /* sort date */ - return e1->time_write - e2->time_write; - - case 2: /* sort date, newest first */ - return e2->time_write - e1->time_write; } return 0; /* never reached */ } @@ -345,6 +346,7 @@ c->dirlength = i; closedir(dir); + compare_sort_dir = *(c->sort_dir); qsort(c->dircache,i,sizeof(struct entry),compare); /* If thumbnail talking is enabled, make an extra run to mark files with Index: apps/playlist_catalog.c =================================================================== --- apps/playlist_catalog.c (revision 18740) +++ apps/playlist_catalog.c (working copy) @@ -120,13 +120,12 @@ bool most_recent = false; struct entry *files; struct tree_context* tc = tree_get_context(); - int dirfilter = *(tc->dirfilter); + int saved_dirfilter = *(tc->dirfilter); *num_playlists = 0; /* use the tree browser dircache to load only playlists */ *(tc->dirfilter) = SHOW_PLAYLIST; - if (ft_load(tc, playlist_dir) < 0) { splashf(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY), playlist_dir); @@ -172,16 +171,13 @@ { for (i=0; idirfilter) = dirfilter; + *(tc->dirfilter) = saved_dirfilter; return result; }