len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Database: Add ability to insert multiple files into playlists

Browse source 
You could only add single files to playlists
from the database browser before. This
enables adding any database selection to
a new or existing playlist.

Change-Id: I811c7167641c589944bb2afc18dcc1d299a7b979
This commit is contained in:
Christian Soffke 2022-08-16 13:10:13 +02:00
parent cc79f1b543
commit 7f265ee8dd
11 changed files with 142 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

61
apps/tagtree.c
View file

@ -2069,10 +2069,14 @@ int tagtree_get_filename(struct tree_context* c, char *buf, int buflen)
return 0;
}
static bool insert_all_playlist(struct tree_context *c, int position, bool queue)
static bool insert_all_playlist(struct tree_context *c,
const char* playlist, bool new_playlist,
int position, bool queue)
{
struct tagcache_search tcs;
int i, n;
int fd = -1;
unsigned long last_tick;
char buf[MAX_PATH];
@ -2084,7 +2088,7 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
return false;
}
if (position == PLAYLIST_REPLACE)
if (playlist == NULL && position == PLAYLIST_REPLACE)
{
if (playlist_remove_all_tracks(NULL) == 0)
position = PLAYLIST_INSERT_LAST;
@ -2094,6 +2098,19 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
return false;
}
}
else if (playlist != NULL)
{
if (new_playlist)
fd = open_utf8(playlist, O_CREAT|O_WRONLY|O_TRUNC);
else
fd = open(playlist, O_CREAT|O_WRONLY|O_APPEND, 0666);
if(fd < 0)
{
cpu_boost(false);
return false;
}
}
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 */
@ -2115,26 +2132,36 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue
continue;
}
if (playlist_insert_track(NULL, buf, position, queue, false) < 0)
if (playlist == NULL)
{
logf("playlist_insert_track failed");
break;
if (playlist_insert_track(NULL, buf, position, queue, false) < 0)
{
logf("playlist_insert_track failed");
break;
}
}
else if (fdprintf(fd, "%s\n", buf) <= 0)
break;
yield();
if (position == PLAYLIST_INSERT_FIRST)
if (playlist == NULL && position == PLAYLIST_INSERT_FIRST)
{
position = PLAYLIST_INSERT;
}
}
playlist_sync(NULL);
if (playlist == NULL)
playlist_sync(NULL);
else
close(fd);
tagcache_search_finish(&tcs);
cpu_boost(false);
return true;
}
bool tagtree_insert_selection_playlist(int position, bool queue)
static bool tagtree_insert_selection(int position, bool queue,
const char* playlist, bool new_playlist)
{
char buf[MAX_PATH];
int dirlevel = tc->dirlevel;
@ -2201,7 +2228,7 @@ bool tagtree_insert_selection_playlist(int position, bool queue)
else
{
logf("insert_all_playlist");
if (!insert_all_playlist(tc, position, queue))
if (!insert_all_playlist(tc, playlist, new_playlist, position, queue))
splash(HZ*2, ID2P(LANG_FAILED));
}
@ -2214,6 +2241,20 @@ bool tagtree_insert_selection_playlist(int position, bool queue)
return true;
}
bool tagtree_current_playlist_insert(int position, bool queue)
{
return tagtree_insert_selection(position, queue, NULL, false);
}
int tagtree_add_to_playlist(const char* playlist, bool new_playlist)
{
if (!new_playlist)
tagtree_load(tc); /* because display_playlists was called */
return tagtree_insert_selection(0, false, playlist, new_playlist) ? 0 : -1;
}
static int tagtree_play_folder(struct tree_context* c)
{
int start_index = c->selected_item;
@ -2224,7 +2265,7 @@ static int tagtree_play_folder(struct tree_context* c)
return -1;
}
if (!insert_all_playlist(c, PLAYLIST_INSERT_LAST, false))
if (!insert_all_playlist(c, NULL, false, PLAYLIST_INSERT_LAST, false))
return -2;
if (global_settings.playlist_shuffle)