summaryrefslogtreecommitdiffstats
path: root/apps/playlist_catalog.c
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2007-10-30 17:38:21 +0000
committerMagnus Holmgren <magnushol@gmail.com>2007-10-30 17:38:21 +0000
commitfabdd384e610e0b6d744eaea361c1045df390065 (patch)
tree76d25c468a2f93208c52eee2265af22db2bceeb2 /apps/playlist_catalog.c
parent09bce70f17614563df09dedd82cff31298fb1a09 (diff)
downloadrockbox-fabdd384e610e0b6d744eaea361c1045df390065.tar.gz
rockbox-fabdd384e610e0b6d744eaea361c1045df390065.tar.bz2
rockbox-fabdd384e610e0b6d744eaea361c1045df390065.zip
Make the playlist catalog use the following settings as appropriate: show filename extensions, load last bookmark, party mode and warn when erasing dynamic playlist.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15378 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playlist_catalog.c')
-rw-r--r--apps/playlist_catalog.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index fda91bb1ee..f5c5bcb35b 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -38,6 +38,7 @@
#include "tree.h"
#include "yesno.h"
#include "filetypes.h"
+#include "debug.h"
#define PLAYLIST_CATALOG_CFG ROCKBOX_DIR "/playlist_catalog.config"
#define PLAYLIST_CATALOG_DEFAULT_DIR "/Playlists"
@@ -212,6 +213,18 @@ static char* playlist_callback_name(int selected_item, void* data,
strncpy(buffer, playlists[selected_item], MAX_PATH);
+ if (buffer[0] != '.' && !(global_settings.show_filename_ext == 1
+ || (global_settings.show_filename_ext == 3
+ && global_settings.dirfilter == 0)))
+ {
+ char* dot = strrchr(buffer, '.');
+
+ if (dot != NULL)
+ {
+ *dot = '\0';
+ }
+ }
+
return buffer;
}
@@ -260,21 +273,12 @@ static int display_playlists(char* playlist, bool view)
break;
case ACTION_STD_OK:
+ snprintf(playlist, MAX_PATH, "%s/%s", playlist_dir, sel_file);
+
if (view)
{
/* In view mode, selecting a playlist starts playback */
- if (playlist_create(playlist_dir, sel_file) != -1)
- {
- if (global_settings.playlist_shuffle)
- playlist_shuffle(current_tick, -1);
- playlist_start(0, 0);
- }
- }
- else
- {
- /* we found the playlist we want to add to */
- snprintf(playlist, MAX_PATH, "%s/%s", playlist_dir,
- sel_file);
+ ft_play_playlist(playlist, playlist_dir, sel_file);
}
result = 0;