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

FS#11808 - Major playlist handling changes (on disk playlists)

Browse source 
* Playlists are treated similar to directories in the browser, they now open in the viewer when selected instead of automatically starting the playlist.
* Make the "Playlists" main menu item useful, it now displays the playlist catalog (and has been renamed accordingly)
* Default to storing playlists in the catalog
* Add a UI to move the catalog directory

(other minor stuff too)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30177 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2011-07-20 14:11:15 +00:00
parent 4983d052a0
commit 97a4c1efa4
12 changed files with 235 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

41
apps/playlist_catalog.c
View file

@ -43,6 +43,8 @@
#include "debug.h"
#include "playlist_catalog.h"
#include "talk.h"
#include "playlist_viewer.h"
#include "bookmark.h"
/* Use for recursive directory search */
struct add_track_context {
@ -59,9 +61,9 @@ static int playlist_dir_length;
static bool playlist_dir_exists = false;
/* Retrieve playlist directory from config file and verify it exists */
static bool initialized = false;
static int initialize_catalog(void)
{
static bool initialized = false;
if (!initialized)
{
@ -110,6 +112,27 @@ static int initialize_catalog(void)
return 0;
}
void catalog_set_directory(const char* directory)
{
if (directory == NULL)
{
global_settings.playlist_catalog_dir[0] = '\0';
}
else
{
strcpy(global_settings.playlist_catalog_dir, directory);
}
initialized = false;
initialize_catalog();
}
const char* catalog_get_directory(void)
{
if (initialize_catalog() == -1)
return "";
return playlist_dir;
}
/* Display all playlists in catalog. Selected "playlist" is returned.
If "view" mode is set then we're not adding anything into playlist. */
static int display_playlists(char* playlist, bool view)
@ -126,6 +149,8 @@ static int display_playlists(char* playlist, bool view)
browse.buf = selected_playlist;
browse.bufsize = sizeof(selected_playlist);
restart:
browse.flags &= ~BROWSE_SELECTED;
rockbox_browse(&browse);
if (browse.flags & BROWSE_SELECTED)
@ -135,9 +160,12 @@ static int display_playlists(char* playlist, bool view)
if (view)
{
char *filename = strrchr(selected_playlist, '/')+1;
/* In view mode, selecting a playlist starts playback */
ft_play_playlist(selected_playlist, playlist_dir, filename);
if (!bookmark_autoload(selected_playlist))
{
if (playlist_viewer_ex(selected_playlist) == PLAYLIST_VIEWER_CANCEL)
goto restart;
}
result = 0;
}
else
@ -311,8 +339,6 @@ bool catalog_add_to_a_playlist(const char* sel, int sel_attr,
snprintf(playlist, MAX_PATH, "%s/%s.m3u8",
playlist_dir,
(name!=NULL && (sel_attr & ATTR_DIRECTORY))?name+1:"");
if (kbd_input(playlist, MAX_PATH))
return false;
}
else
strcpy(playlist, m3u8name);
@ -323,6 +349,9 @@ bool catalog_add_to_a_playlist(const char* sel, int sel_attr,
strcat(playlist, "8");
else if(len <= 5 || strcasecmp(&playlist[len-5], ".m3u8"))
strcat(playlist, ".m3u8");
if (kbd_input(playlist, MAX_PATH))
return false;
}
else
{