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

Reworks to the shuffle system to improve performance and allow fast shuffling from a big library (but this work for all database views)

Browse source 
This improvement brings a huge performance improvement to start a random mix of your library. Previously, the only way to do this was to increase the size of a playlist with absurd sizes number. Now it will respect the limitation but will insert random songs from the current view.

Database: Add true random songs in playlist if it is gonna exceed its maximum capacity

More context is available here : https://www.reddit.com/r/rockbox/comments/1ez0mq4/i_developped_true_full_library_shuffle_for/

Also :
- Improved layout in the DB browser
- New default max playlists capacity is now 2000 on old PortalPlayer targets to give a better user experience and not having to wait dozens of seconds while creating a playlist
- "Show insert shuffled" option is now true by default
- Add a new shortcut to play all songs shuffled in the DB browser
- Now the feature is fully optional and enabled only on targets that have more than 2MB of RAM
- Add entries about this feature in the manual to explain it to the users
Change-Id: I1aebaf7ebcff2bf907080f1861027d530619097c

Change-Id: I3354923b148eeef1975171990e814a1a505d1df0
This commit is contained in:
Paul Sauro 2024-08-28 22:55:52 +02:00 • committed by William Wilgus
parent f6e8c20188
commit c16dbbfd1f
13 changed files with 264 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/gui/wps.c
View file

@ -806,7 +806,7 @@ long gui_wps_show(void)
theme_enabled = false; theme_enabled = false;
gwps_leave_wps(theme_enabled); gwps_leave_wps(theme_enabled);
onplay(state->id3->path, onplay(state->id3->path,
FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey); FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey, ONPLAY_NO_CUSTOMACTION);
if (!audio_status()) if (!audio_status())
{ {
/* re-enable theme since we're returning to SBS */ /* re-enable theme since we're returning to SBS */
@ -823,7 +823,7 @@ long gui_wps_show(void)
{ {
gwps_leave_wps(true); gwps_leave_wps(true);
int retval = onplay(state->id3->path, int retval = onplay(state->id3->path,
FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey); FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey, ONPLAY_NO_CUSTOMACTION);
/* if music is stopped in the context menu we want to exit the wps */ /* if music is stopped in the context menu we want to exit the wps */
if (retval == ONPLAY_MAINMENU if (retval == ONPLAY_MAINMENU
|| !audio_status()) || !audio_status())

14
apps/lang/english.lang
View file

@ -2053,6 +2053,20 @@
*: "entries found for database" *: "entries found for database"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
user: core
<source>
*: "Selection too big, %d random tracks will be picked from it"
</source>
<dest>
*: "Selection too big, %d random tracks will be picked from it"
</dest>
<voice>
*: "Selection too big, fewer random tracks will be picked from it"
</voice>
</phrase>
<phrase> <phrase>
id: LANG_TAGCACHE_RAM id: LANG_TAGCACHE_RAM
desc: in tag cache settings desc: in tag cache settings

14
apps/lang/francais.lang
View file

@ -2027,6 +2027,20 @@
*: "entrées trouvées pour base de données" *: "entrées trouvées pour base de données"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
user: core
<source>
*: "Selection too big, %d random tracks will be picked from it"
</source>
<dest>
*: "Selection trop grande, %d pistes seront sélectionnées aléatoirement depuis celle-ci"
</dest>
<voice>
*: "Selection trop grande, donc des pistes seront sélectionnées aléatoirement depuis celle-ci"
</voice>
</phrase>
<phrase> <phrase>
id: LANG_TAGCACHE_RAM id: LANG_TAGCACHE_RAM
desc: in tag cache settings desc: in tag cache settings

13
apps/onplay.c
View file

@ -302,7 +302,7 @@ static int add_to_playlist(void* arg)
/* warn if replacing the playlist */ /* warn if replacing the playlist */
if (new_playlist && !warn_on_pl_erase()) if (new_playlist && !warn_on_pl_erase())
return 0; return 1;
splash(0, ID2P(LANG_WAIT)); splash(0, ID2P(LANG_WAIT));
@ -340,7 +340,7 @@ static int add_to_playlist(void* arg)
} }
playlist_set_modified(NULL, true); playlist_set_modified(NULL, true);
return false; return 0;
} }
static bool view_playlist(void) static bool view_playlist(void)
@ -1255,7 +1255,7 @@ static int execute_hotkey(bool is_wps)
} }
#endif /* HOTKEY */ #endif /* HOTKEY */
int onplay(char* file, int attr, int from_context, bool hotkey) int onplay(char* file, int attr, int from_context, bool hotkey, int customaction)
{ {
const struct menu_item_ex *menu; const struct menu_item_ex *menu;
onplay_result = ONPLAY_OK; onplay_result = ONPLAY_OK;
@ -1294,6 +1294,13 @@ int onplay(char* file, int attr, int from_context, bool hotkey)
#else #else
(void)hotkey; (void)hotkey;
#endif #endif
if (customaction == ONPLAY_CUSTOMACTION_SHUFFLE_SONGS) {
int returnCode = add_to_playlist(&addtopl_replace_shuffled);
if (returnCode == 1)
// User did not want to erase his current playlist, so let's show again the database main menu
return ONPLAY_RELOAD_DIR;
return ONPLAY_START_PLAY;
}
push_current_activity(ACTIVITY_CONTEXTMENU); push_current_activity(ACTIVITY_CONTEXTMENU);
if (from_context == CONTEXT_WPS) if (from_context == CONTEXT_WPS)

7
apps/onplay.h
View file

@ -25,7 +25,12 @@
#include "menu.h" #include "menu.h"
#endif #endif
int onplay(char* file, int attr, int from_context, bool hotkey); enum {
ONPLAY_NO_CUSTOMACTION,
ONPLAY_CUSTOMACTION_SHUFFLE_SONGS,
};
int onplay(char* file, int attr, int from_context, bool hotkey, int customaction);
int get_onplay_context(void); int get_onplay_context(void);
enum { enum {

2
apps/playlist_viewer.c
View file

@ -1107,7 +1107,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename,
} }
} }
else else
onplay(current_track->name, FILE_ATTR_AUDIO, CONTEXT_STD, true); onplay(current_track->name, FILE_ATTR_AUDIO, CONTEXT_STD, true, ONPLAY_NO_CUSTOMACTION);
break; break;
} }
#endif /* HAVE_HOTKEY */ #endif /* HAVE_HOTKEY */

8
apps/settings_list.c
View file

@ -1120,7 +1120,11 @@ const struct settings_list settings[] = {
SYSTEM_SETTING(NVRAM(4), topruntime, 0), SYSTEM_SETTING(NVRAM(4), topruntime, 0),
INT_SETTING(F_BANFROMQS, max_files_in_playlist, INT_SETTING(F_BANFROMQS, max_files_in_playlist,
LANG_MAX_FILES_IN_PLAYLIST, LANG_MAX_FILES_IN_PLAYLIST,
#if MEMORYSIZE > 1 #if CONFIG_CPU == PP5002 || CONFIG_CPU == PP5020 || CONFIG_CPU == PP5022
/** Slow CPU benefits greatly from building smaller playlists
On the iPod Mini 2nd gen, creating a playlist of 2000 entries takes around 10 seconds */
2000,
#elif MEMORYSIZE > 1
10000, 10000,
#else #else
400, 400,
@ -1854,7 +1858,7 @@ const struct settings_list settings[] = {
true, "warn when erasing dynamic playlist",NULL), true, "warn when erasing dynamic playlist",NULL),
OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE, OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE,
true, "keep current track when replacing playlist",NULL), true, "keep current track when replacing playlist",NULL),
OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, false, OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, true,
"show shuffled adding options", NULL), "show shuffled adding options", NULL),
CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0, CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0,
"show queue options", "off,on,in submenu", "show queue options", "off,on,in submenu",

17
apps/tagnavi.config
View file

@ -176,20 +176,21 @@
# Define the title of the main menu # Define the title of the main menu
%menu_start "main" "Database" %menu_start "main" "Database"
"Artist" -> canonicalartist -> album -> title = "fmt_title"
"Album Artist" -> albumartist -> album -> title = "fmt_title" "Album Artist" -> albumartist -> album -> title = "fmt_title"
"Artist" -> canonicalartist -> album -> title = "fmt_title"
"Album" -> album -> title = "fmt_title" "Album" -> album -> title = "fmt_title"
"Genre" -> genre -> canonicalartist -> album -> title = "fmt_title" "Genre" -> genre -> canonicalartist -> album -> title = "fmt_title"
"Composer" -> composer -> album -> title = "fmt_title"
"Track" ==> "track"
"Year" -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title" "Year" -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
"Composer" -> composer -> album -> title = "fmt_title"
"A to Z" ==> "a2z"
"Track" ==> "track"
"Shuffle Songs" ~> title = "fmt_title"
"Search" ==> "search"
"User Rating" -> rating -> title = "fmt_title" "User Rating" -> rating -> title = "fmt_title"
"Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title" "Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title"
"A to Z..." ==> "a2z" "History" ==> "runtime"
"History..." ==> "runtime" "Same as current" ==> "same"
"Same as current..." ==> "same" "Custom view" ==> "custom"
"Search..." ==> "search"
"Custom view..." ==> "custom"
# And finally set main menu as our root menu # And finally set main menu as our root menu
%root_menu "main" %root_menu "main"

228
apps/tagtree.c
View file

@ -56,6 +56,7 @@
#include "playback.h" #include "playback.h"
#include "strnatcmp.h" #include "strnatcmp.h"
#include "panic.h" #include "panic.h"
#include "onplay.h"
#define str_or_empty(x) (x ? x : "(NULL)") #define str_or_empty(x) (x ? x : "(NULL)")
@ -71,6 +72,7 @@ struct tagentry {
char* name; char* name;
int newtable; int newtable;
int extraseek; int extraseek;
int customaction;
}; };
static struct tagentry* tagtree_get_entry(struct tree_context *c, int id); static struct tagentry* tagtree_get_entry(struct tree_context *c, int id);
@ -78,10 +80,10 @@ static struct tagentry* tagtree_get_entry(struct tree_context *c, int id);
#define SEARCHSTR_SIZE 256 #define SEARCHSTR_SIZE 256
enum table { enum table {
ROOT = 1, TABLE_ROOT = 1,
NAVIBROWSE, TABLE_NAVIBROWSE,
ALLSUBENTRIES, TABLE_ALLSUBENTRIES,
PLAYTRACK, TABLE_PLAYTRACK,
}; };
static const struct id3_to_search_mapping { static const struct id3_to_search_mapping {
@ -108,12 +110,21 @@ enum variables {
menu_next, menu_next,
menu_load, menu_load,
menu_reload, menu_reload,
menu_shuffle_songs,
}; };
/* Capacity 10 000 entries (for example 10k different artists) */ /* Capacity 10 000 entries (for example 10k different artists) */
#define UNIQBUF_SIZE (64*1024) #define UNIQBUF_SIZE (64*1024)
static uint32_t uniqbuf[UNIQBUF_SIZE / sizeof(uint32_t)]; static uint32_t uniqbuf[UNIQBUF_SIZE / sizeof(uint32_t)];
#if MEMORYSIZE > 2
#define INSERT_ALL_PLAYLIST_MAX_SEGMENT_SIZE (1024)
#else
/* Lower quality randomness for low-ram devices using smaller segments */
#define INSERT_ALL_PLAYLIST_MAX_SEGMENT_SIZE (128)
#endif
static bool selective_random_playlist_indexes[INSERT_ALL_PLAYLIST_MAX_SEGMENT_SIZE];
#define MAX_TAGS 5 #define MAX_TAGS 5
#define MAX_MENU_ID_SIZE 32 #define MAX_MENU_ID_SIZE 32
@ -338,6 +349,7 @@ static int get_tag(int *tag)
TAG_MATCH("Pm", tag_virt_playtime_min), TAG_MATCH("Pm", tag_virt_playtime_min),
TAG_MATCH("Ps", tag_virt_playtime_sec), TAG_MATCH("Ps", tag_virt_playtime_sec),
TAG_MATCH("->", menu_next), TAG_MATCH("->", menu_next),
TAG_MATCH("~>", menu_shuffle_songs),
TAG_MATCH("==>", menu_load), TAG_MATCH("==>", menu_load),
@ -820,7 +832,7 @@ static bool parse_search(struct menu_entry *entry, const char *str)
return true; return true;
} }
if (entry->type != menu_next) if (entry->type != menu_next && entry->type != menu_shuffle_songs)
return false; return false;
while (inst->tagorder_count < MAX_TAGS) while (inst->tagorder_count < MAX_TAGS)
@ -847,7 +859,7 @@ static bool parse_search(struct menu_entry *entry, const char *str)
inst->tagorder_count++; inst->tagorder_count++;
if (get_tag(&type) <= 0 || type != menu_next) if (get_tag(&type) <= 0 || (type != menu_next && type != menu_shuffle_songs))
break; break;
} }
@ -1245,6 +1257,7 @@ static void tagtree_unload(struct tree_context *c)
dptr->name = NULL; dptr->name = NULL;
dptr->newtable = 0; dptr->newtable = 0;
dptr->extraseek = 0; dptr->extraseek = 0;
dptr->customaction = ONPLAY_NO_CUSTOMACTION;
dptr++; dptr++;
} }
} }
@ -1454,7 +1467,7 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
#endif #endif
, 0, 0, 0); , 0, 0, 0);
if (c->currtable == ALLSUBENTRIES) if (c->currtable == TABLE_ALLSUBENTRIES)
{ {
tag = tag_title; tag = tag_title;
level--; level--;
@ -1544,17 +1557,19 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
{ {
if (offset == 0) if (offset == 0)
{ {
dptr->newtable = ALLSUBENTRIES; dptr->newtable = TABLE_ALLSUBENTRIES;
dptr->name = str(LANG_TAGNAVI_ALL_TRACKS); dptr->name = str(LANG_TAGNAVI_ALL_TRACKS);
dptr->customaction = ONPLAY_NO_CUSTOMACTION;
dptr++; dptr++;
current_entry_count++; current_entry_count++;
special_entry_count++; special_entry_count++;
} }
if (offset <= 1) if (offset <= 1)
{ {
dptr->newtable = NAVIBROWSE; dptr->newtable = TABLE_NAVIBROWSE;
dptr->name = str(LANG_TAGNAVI_RANDOM); dptr->name = str(LANG_TAGNAVI_RANDOM);
dptr->extraseek = -1; dptr->extraseek = -1;
dptr->customaction = ONPLAY_NO_CUSTOMACTION;
dptr++; dptr++;
current_entry_count++; current_entry_count++;
special_entry_count++; special_entry_count++;
@ -1568,14 +1583,15 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
if (total_count++ < offset) if (total_count++ < offset)
continue; continue;
dptr->newtable = NAVIBROWSE; dptr->newtable = TABLE_NAVIBROWSE;
if (tag == tag_title || tag == tag_filename) if (tag == tag_title || tag == tag_filename)
{ {
dptr->newtable = PLAYTRACK; dptr->newtable = TABLE_PLAYTRACK;
dptr->extraseek = tcs.idx_id; dptr->extraseek = tcs.idx_id;
} }
else else
dptr->extraseek = tcs.result_seek; dptr->extraseek = tcs.result_seek;
dptr->customaction = ONPLAY_NO_CUSTOMACTION;
fmt = NULL; fmt = NULL;
/* Check the format */ /* Check the format */
@ -1758,7 +1774,7 @@ static int load_root(struct tree_context *c)
int i; int i;
tc = c; tc = c;
c->currtable = ROOT; c->currtable = TABLE_ROOT;
if (c->dirlevel == 0) if (c->dirlevel == 0)
c->currextra = rootmenu; c->currextra = rootmenu;
@ -1775,13 +1791,21 @@ static int load_root(struct tree_context *c)
switch (menu->items[i]->type) switch (menu->items[i]->type)
{ {
case menu_next: case menu_next:
dptr->newtable = NAVIBROWSE; dptr->newtable = TABLE_NAVIBROWSE;
dptr->extraseek = i; dptr->extraseek = i;
dptr->customaction = ONPLAY_NO_CUSTOMACTION;
break; break;
case menu_load: case menu_load:
dptr->newtable = ROOT; dptr->newtable = TABLE_ROOT;
dptr->extraseek = menu->items[i]->link; dptr->extraseek = menu->items[i]->link;
dptr->customaction = ONPLAY_NO_CUSTOMACTION;
break;
case menu_shuffle_songs:
dptr->newtable = TABLE_NAVIBROWSE;
dptr->extraseek = i;
dptr->customaction = ONPLAY_CUSTOMACTION_SHUFFLE_SONGS;
break; break;
} }
@ -1804,19 +1828,19 @@ int tagtree_load(struct tree_context* c)
if (!table) if (!table)
{ {
c->dirfull = false; c->dirfull = false;
table = ROOT; table = TABLE_ROOT;
c->currtable = table; c->currtable = table;
c->currextra = rootmenu; c->currextra = rootmenu;
} }
switch (table) switch (table)
{ {
case ROOT: case TABLE_ROOT:
count = load_root(c); count = load_root(c);
break; break;
case ALLSUBENTRIES: case TABLE_ALLSUBENTRIES:
case NAVIBROWSE: case TABLE_NAVIBROWSE:
logf("navibrowse..."); logf("navibrowse...");
cpu_boost(true); cpu_boost(true);
count = retrieve_entries(c, 0, true); count = retrieve_entries(c, 0, true);
@ -1921,16 +1945,16 @@ int tagtree_enter(struct tree_context* c, bool is_visible)
core_pin(tagtree_handle); core_pin(tagtree_handle);
switch (c->currtable) { switch (c->currtable) {
case ROOT: case TABLE_ROOT:
c->currextra = newextra; c->currextra = newextra;
if (newextra == ROOT) if (newextra == TABLE_ROOT)
{ {
menu = menus[seek]; menu = menus[seek];
c->currextra = seek; c->currextra = seek;
} }
else if (newextra == NAVIBROWSE) else if (newextra == TABLE_NAVIBROWSE)
{ {
int i, j; int i, j;
@ -2005,9 +2029,9 @@ int tagtree_enter(struct tree_context* c, bool is_visible)
break; break;
case NAVIBROWSE: case TABLE_NAVIBROWSE:
case ALLSUBENTRIES: case TABLE_ALLSUBENTRIES:
if (newextra == PLAYTRACK) if (newextra == TABLE_PLAYTRACK)
{ {
adjust_selection = false; adjust_selection = false;
@ -2102,13 +2126,46 @@ int tagtree_get_filename(struct tree_context* c, char *buf, int buflen)
return 0; return 0;
} }
int tagtree_get_custom_action(struct tree_context* c)
{
return tagtree_get_entry(c, c->selected_item)->customaction;
}
static void swap_array_bool(bool *a, bool *b) {
bool temp = *a;
*a = *b;
*b = temp;
}
/**
* Randomly shuffle an array using the Fisher-Yates algorithm : https://en.wikipedia.org/wiki/Random_permutation
* This algorithm has a linear complexity. Don't forget to srand before call to use it with a relevant seed.
*/
static void shuffle_bool_array(bool array[], int size) {
for (int i = size - 1; i > 0; i--) {
int j = rand() % (i + 1);
swap_array_bool(&array[i], &array[j]);
}
}
static bool fill_selective_random_playlist_indexes(int current_segment_n, int current_segment_max_available_space) {
if (current_segment_n == 0 || current_segment_max_available_space == 0)
return false;
if (current_segment_max_available_space > current_segment_n)
current_segment_max_available_space = current_segment_n;
for (int i = 0; i < current_segment_n; i++)
selective_random_playlist_indexes[i] = i < current_segment_max_available_space;
srand(current_tick);
shuffle_bool_array(selective_random_playlist_indexes, current_segment_n);
return true;
}
static bool insert_all_playlist(struct tree_context *c, static bool insert_all_playlist(struct tree_context *c,
const char* playlist, bool new_playlist, const char* playlist, bool new_playlist,
int position, bool queue) int position, bool queue)
{ {
struct tagcache_search tcs; struct tagcache_search tcs;
int i, n; int n;
int fd = -1; int fd = -1;
unsigned long last_tick; unsigned long last_tick;
char buf[MAX_PATH]; char buf[MAX_PATH];
@ -2144,44 +2201,77 @@ static bool insert_all_playlist(struct tree_context *c,
return false; return false;
} }
} }
last_tick = current_tick + HZ/2; /* Show splash after 0.5 seconds have passed */ last_tick = current_tick + HZ/2; /* Show splash after 0.5 seconds have passed */
splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */ splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */
n = c->filesindir; n = c->filesindir;
for (i = 0; i < n; i++) int segment_size = INSERT_ALL_PLAYLIST_MAX_SEGMENT_SIZE;
{ int segments_count = n / segment_size;
int leftovers_segment_size = n % segment_size;
splash_progress(i, n, "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT)); bool fill_randomly = false;
if (TIME_AFTER(current_tick, last_tick + HZ/4)) if (playlist == NULL) {
{ bool will_exceed = n > playlist_get_current()->max_playlist_size;
if (action_userabort(TIMEOUT_NOBLOCK)) fill_randomly = will_exceed;
break; }
last_tick = current_tick; if (leftovers_segment_size > 0 && fill_randomly) {
// We need to re-balance the segments so the randomness will be coherent and balanced the same through all segments
while (leftovers_segment_size + segments_count < segment_size) {
segment_size--; // -1 to all other segments
leftovers_segment_size += segments_count;
} }
}
if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, i)->extraseek, if (leftovers_segment_size > 0)
tcs.type, buf, sizeof buf)) segments_count += 1;
{ int max_available_space = playlist_get_current()->max_playlist_size - playlist_get_current()->amount;
continue; int max_available_space_per_segment = max_available_space / segments_count;
if (fill_randomly) {
talk_id(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY, true);
splashf(HZ * 3, str(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY), max_available_space_per_segment * segments_count);
//splashf(HZ * 5, "sz=%d lsz=%d sc=%d rcps=%d", segment_size, leftovers_segment_size, segments_count, max_available_space_per_segment);
}
for (int i = 0; i < segments_count; i++) {
bool is_leftovers_segment = leftovers_segment_size > 0 && i + 1 >= segments_count;
if (fill_randomly) {
if (is_leftovers_segment)
fill_randomly = fill_selective_random_playlist_indexes(leftovers_segment_size, max_available_space_per_segment);
else
fill_randomly = fill_selective_random_playlist_indexes(segment_size, max_available_space_per_segment);
} }
bool exit_loop_now = false;
if (playlist == NULL) int cur_segment_start = i * segment_size;
{ int cur_segment_end;
if (playlist_insert_track(NULL, buf, position, queue, false) < 0) if (is_leftovers_segment)
{ cur_segment_end = cur_segment_start + leftovers_segment_size;
logf("playlist_insert_track failed"); else
cur_segment_end = cur_segment_start + segment_size;
for (int j = cur_segment_start; j < cur_segment_end && !exit_loop_now; j++) {
if (fill_randomly && !selective_random_playlist_indexes[j % segment_size])
continue;
splash_progress(j, n, "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT));
if (TIME_AFTER(current_tick, last_tick + HZ/4)) {
if (action_userabort(TIMEOUT_NOBLOCK)) {
exit_loop_now = true;
break;
}
last_tick = current_tick;
}
if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, j)->extraseek, tcs.type, buf, sizeof buf))
continue;
if (playlist == NULL) {
if (playlist_insert_track(NULL, buf, position, queue, false) < 0) {
logf("playlist_insert_track failed");
exit_loop_now = true;
break;
}
} else if (fdprintf(fd, "%s\n", buf) <= 0) {
exit_loop_now = true;
break; break;
} }
yield();
if (playlist == NULL && position == PLAYLIST_INSERT_FIRST)
position = PLAYLIST_INSERT;
} }
else if (fdprintf(fd, "%s\n", buf) <= 0) if (exit_loop_now)
break; break;
yield();
if (playlist == NULL && position == PLAYLIST_INSERT_FIRST)
{
position = PLAYLIST_INSERT;
}
} }
if (playlist == NULL) if (playlist == NULL)
playlist_sync(NULL); playlist_sync(NULL);
@ -2196,14 +2286,14 @@ static bool insert_all_playlist(struct tree_context *c,
static bool goto_allsubentries(int newtable) static bool goto_allsubentries(int newtable)
{ {
int i = 0; int i = 0;
while (i < 2 && (newtable == NAVIBROWSE || newtable == ALLSUBENTRIES)) while (i < 2 && (newtable == TABLE_NAVIBROWSE || newtable == TABLE_ALLSUBENTRIES))
{ {
tagtree_enter(tc, false); tagtree_enter(tc, false);
tagtree_load(tc); tagtree_load(tc);
newtable = tagtree_get_entry(tc, tc->selected_item)->newtable; newtable = tagtree_get_entry(tc, tc->selected_item)->newtable;
i++; i++;
} }
return (newtable == PLAYTRACK); return (newtable == TABLE_PLAYTRACK);
} }
static void reset_tc_to_prev(int dirlevel, int selected_item) static void reset_tc_to_prev(int dirlevel, int selected_item)
@ -2233,7 +2323,7 @@ static bool tagtree_insert_selection(int position, bool queue,
newtable = tagtree_get_entry(tc, tc->selected_item)->newtable; newtable = tagtree_get_entry(tc, tc->selected_item)->newtable;
if (newtable == PLAYTRACK) /* Insert a single track? */ if (newtable == TABLE_PLAYTRACK) /* Insert a single track? */
{ {
if (tagtree_get_filename(tc, buf, sizeof buf) < 0) if (tagtree_get_filename(tc, buf, sizeof buf) < 0)
return false; return false;
@ -2353,9 +2443,19 @@ static int tagtree_play_folder(struct tree_context* c)
if (!insert_all_playlist(c, NULL, false, PLAYLIST_INSERT_LAST, false)) if (!insert_all_playlist(c, NULL, false, PLAYLIST_INSERT_LAST, false))
return -2; return -2;
int n = c->filesindir;
bool has_playlist_been_randomized = n > playlist_get_current()->max_playlist_size;
if (has_playlist_been_randomized) {
/* We need to recalculate the start index based on a percentage to put the user
around its desired start position and avoid out of bounds */
int percentage_start_index = 100 * start_index / n;
start_index = percentage_start_index * playlist_get_current()->amount / 100;
}
if (global_settings.playlist_shuffle) if (global_settings.playlist_shuffle)
{ {
start_index = playlist_shuffle(current_tick, c->selected_item); start_index = playlist_shuffle(current_tick, start_index);
if (!global_settings.play_selected) if (!global_settings.play_selected)
start_index = 0; start_index = 0;
} }
@ -2403,11 +2503,11 @@ char *tagtree_get_title(struct tree_context* c)
{ {
switch (c->currtable) switch (c->currtable)
{ {
case ROOT: case TABLE_ROOT:
return menu->title; return menu->title;
case NAVIBROWSE: case TABLE_NAVIBROWSE:
case ALLSUBENTRIES: case TABLE_ALLSUBENTRIES:
return current_title[c->currextra]; return current_title[c->currextra];
} }
@ -2419,7 +2519,7 @@ int tagtree_get_attr(struct tree_context* c)
int attr = -1; int attr = -1;
switch (c->currtable) switch (c->currtable)
{ {
case NAVIBROWSE: case TABLE_NAVIBROWSE:
if (csi->tagorder[c->currextra] == tag_title if (csi->tagorder[c->currextra] == tag_title
|| csi->tagorder[c->currextra] == tag_virt_basename) || csi->tagorder[c->currextra] == tag_virt_basename)
attr = FILE_ATTR_AUDIO; attr = FILE_ATTR_AUDIO;
@ -2427,7 +2527,7 @@ int tagtree_get_attr(struct tree_context* c)
attr = ATTR_DIRECTORY; attr = ATTR_DIRECTORY;
break; break;
case ALLSUBENTRIES: case TABLE_ALLSUBENTRIES:
attr = FILE_ATTR_AUDIO; attr = FILE_ATTR_AUDIO;
break; break;

1
apps/tagtree.h
View file

@ -45,6 +45,7 @@ char *tagtree_get_title(struct tree_context* c);
int tagtree_get_attr(struct tree_context* c); int tagtree_get_attr(struct tree_context* c);
int tagtree_get_icon(struct tree_context* c); int tagtree_get_icon(struct tree_context* c);
int tagtree_get_filename(struct tree_context* c, char *buf, int buflen); int tagtree_get_filename(struct tree_context* c, char *buf, int buflen);
int tagtree_get_custom_action(struct tree_context* c);
bool tagtree_get_subentry_filename(char *buf, size_t bufsize); bool tagtree_get_subentry_filename(char *buf, size_t bufsize);
bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name)); bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name));

27
apps/tree.c
View file

@ -735,6 +735,17 @@ static int dirbrowse(void)
oldbutton = button; oldbutton = button;
gui_synclist_do_button(&tree_lists, &button); gui_synclist_do_button(&tree_lists, &button);
tc.selected_item = gui_synclist_get_sel_pos(&tree_lists); tc.selected_item = gui_synclist_get_sel_pos(&tree_lists);
int customaction = ONPLAY_NO_CUSTOMACTION;
bool do_restore_display = true;
#ifdef HAVE_TAGCACHE
if (id3db && (button == ACTION_STD_OK || button == ACTION_STD_CONTEXT)) {
customaction = tagtree_get_custom_action(&tc);
if (customaction == ONPLAY_CUSTOMACTION_SHUFFLE_SONGS) {
button = ACTION_STD_CONTEXT; /** The code to insert shuffled is on the context branch of the switch so we always go here */
do_restore_display = false;
}
}
#endif
switch ( button ) { switch ( button ) {
case ACTION_STD_OK: case ACTION_STD_OK:
/* nothing to do if no files to display */ /* nothing to do if no files to display */
@ -773,7 +784,7 @@ static int dirbrowse(void)
default: default:
break; break;
} }
restore = true; restore = do_restore_display;
break; break;
case ACTION_STD_CANCEL: case ACTION_STD_CANCEL:
@ -798,12 +809,12 @@ static int dirbrowse(void)
if (ft_exit(&tc) == 3) if (ft_exit(&tc) == 3)
exit_func = true; exit_func = true;
restore = true; restore = do_restore_display;
break; break;
case ACTION_TREE_STOP: case ACTION_TREE_STOP:
if (list_stop_handler()) if (list_stop_handler())
restore = true; restore = do_restore_display;
break; break;
case ACTION_STD_MENU: case ACTION_STD_MENU:
@ -851,7 +862,7 @@ static int dirbrowse(void)
skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL); skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
} }
restore = true; restore = do_restore_display;
break; break;
} }
#endif #endif
@ -872,7 +883,7 @@ static int dirbrowse(void)
break; break;
if(!numentries) if(!numentries)
onplay_result = onplay(NULL, 0, curr_context, hotkey); onplay_result = onplay(NULL, 0, curr_context, hotkey, customaction);
else { else {
#ifdef HAVE_TAGCACHE #ifdef HAVE_TAGCACHE
if (id3db) if (id3db)
@ -902,7 +913,7 @@ static int dirbrowse(void)
ft_assemble_path(buf, sizeof(buf), currdir, entry->name); ft_assemble_path(buf, sizeof(buf), currdir, entry->name);
} }
onplay_result = onplay(buf, attr, curr_context, hotkey); onplay_result = onplay(buf, attr, curr_context, hotkey, customaction);
} }
switch (onplay_result) switch (onplay_result)
{ {
@ -911,7 +922,7 @@ static int dirbrowse(void)
break; break;
case ONPLAY_OK: case ONPLAY_OK:
restore = true; restore = do_restore_display;
break; break;
case ONPLAY_RELOAD_DIR: case ONPLAY_RELOAD_DIR:
@ -988,7 +999,7 @@ static int dirbrowse(void)
lastfilter = *tc.dirfilter; lastfilter = *tc.dirfilter;
lastsortcase = global_settings.sort_case; lastsortcase = global_settings.sort_case;
restore = true; restore = do_restore_display;
} }
if (exit_func) if (exit_func)

3
apps/tree.h
View file

@ -33,6 +33,9 @@ struct entry {
char *name; char *name;
int attr; /* FAT attributes + file type flags */ int attr; /* FAT attributes + file type flags */
unsigned time_write; /* Last write time */ unsigned time_write; /* Last write time */
#ifdef HAVE_TAGCACHE
int customaction; /* db use */
#endif
}; };
#define BROWSE_SELECTONLY 0x0001 /* exit on selecting a file */ #define BROWSE_SELECTONLY 0x0001 /* exit on selecting a file */

15
manual/rockbox_interface/tagcache.tex
View file

@ -137,6 +137,21 @@ There is no option to turn off database completely. If you do not want
to use it just do not do the initial build of the database and do not load it to use it just do not do the initial build of the database and do not load it
to RAM.}% to RAM.}%
If your total amount of music tracks exceeds the value of the
\setting{Max Playlist Size} setting (\setting{Settings $\rightarrow$ General
Settings $\rightarrow$ System $\rightarrow$ Limits}), using the database
will be your only way to shuffle between all songs from your music library.
Any view on the database browser that exceeds the maximum value of this option
will be automatically adjusted and randomized to fit into the available space
when you will create a dynamic playlist from the view.
Using the database browser is recommended if you shuffle regularly between a lot of
songs rather than increasing your limit, so you will get the best possible performance
on this action.
\note{For your convenience, a shortcut button "Shuffle Songs" is available directly
from the \setting{Database} menu to create and start a mix with all of your
existing music tracks.}
\begin{table} \begin{table}
\begin{rbtabular}{.75\textwidth}{XXX}% \begin{rbtabular}{.75\textwidth}{XXX}%
{\textbf{Tag} & \textbf{Type} & \textbf{Origin}}{}{} {\textbf{Tag} & \textbf{Type} & \textbf{Origin}}{}{}