diff options
author | William Wilgus <me.theuser@yahoo.com> | 2019-08-17 23:40:45 -0500 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2019-08-18 10:18:31 -0500 |
commit | 8b7ae89b43ef4c96b55671759869397676ee9e05 (patch) | |
tree | fb40f9f121d6d73667221b08d9af558e02bcae74 /apps/tree.c | |
parent | 5a4cdb96b91078c7cd3f8d5a389aace68b530437 (diff) | |
download | rockbox-8b7ae89b43ef4c96b55671759869397676ee9e05.tar.gz rockbox-8b7ae89b43ef4c96b55671759869397676ee9e05.zip |
Playlist rework
consolidate some of the playlist create functions
remove extensions from playlist naming (you can still add it if you desire)
switch to strlcpy, strlcpy functions
Change-Id: Ibd62912da4d1f68ed5366baa887d92d4c6b1f933
Diffstat (limited to 'apps/tree.c')
-rw-r--r-- | apps/tree.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/tree.c b/apps/tree.c index 8f0abf4a8b..311c3ce543 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -941,9 +941,11 @@ static int dirbrowse(void) | |||
941 | 941 | ||
942 | int create_playlist(void) | 942 | int create_playlist(void) |
943 | { | 943 | { |
944 | bool ret; | ||
945 | #if 0 /* handled in catalog_add_to_a_playlist() */ | ||
944 | char filename[MAX_PATH + 16]; /* add enough space for extension */ | 946 | char filename[MAX_PATH + 16]; /* add enough space for extension */ |
945 | const char *playlist_dir = catalog_get_directory(); | 947 | const char *playlist_dir = catalog_get_directory(); |
946 | if (strcmp(tc.currdir, playlist_dir) != 0) | 948 | if (tc.currdir[1] && strcmp(tc.currdir, playlist_dir) != 0) |
947 | snprintf(filename, sizeof filename, "%s.m3u8", tc.currdir); | 949 | snprintf(filename, sizeof filename, "%s.m3u8", tc.currdir); |
948 | else | 950 | else |
949 | snprintf(filename, sizeof filename, "%s/all.m3u8", playlist_dir); | 951 | snprintf(filename, sizeof filename, "%s/all.m3u8", playlist_dir); |
@@ -951,12 +953,13 @@ int create_playlist(void) | |||
951 | if (kbd_input(filename, MAX_PATH)) | 953 | if (kbd_input(filename, MAX_PATH)) |
952 | return 0; | 954 | return 0; |
953 | splashf(0, "%s %s", str(LANG_CREATING), filename); | 955 | splashf(0, "%s %s", str(LANG_CREATING), filename); |
956 | #endif | ||
954 | 957 | ||
955 | trigger_cpu_boost(); | 958 | trigger_cpu_boost(); |
956 | catalog_add_to_a_playlist(tc.currdir, ATTR_DIRECTORY, true, filename); | 959 | ret = catalog_add_to_a_playlist(tc.currdir, ATTR_DIRECTORY, true, NULL); |
957 | cancel_cpu_boost(); | 960 | cancel_cpu_boost(); |
958 | 961 | ||
959 | return 1; | 962 | return (ret) ? 1 : 0; |
960 | } | 963 | } |
961 | 964 | ||
962 | void browse_context_init(struct browse_context *browse, | 965 | void browse_context_init(struct browse_context *browse, |