From 97a4c1efa473e40b4dd7287571f3b1c9caaba97d Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 20 Jul 2011 14:11:15 +0000 Subject: FS#11808 - Major playlist handling changes (on disk playlists) * 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 --- apps/filetree.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'apps/filetree.c') diff --git a/apps/filetree.c b/apps/filetree.c index b7f3c9e..654d33d 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -1,4 +1,4 @@ -/*************************************************************************** + /*************************************************************************** * __________ __ ___. * Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / @@ -43,6 +43,7 @@ #include "filetree.h" #include "misc.h" #include "strnatcmp.h" +#include "playlist_viewer.h" #ifdef HAVE_LCD_BITMAP #include "keyboard.h" #endif @@ -445,13 +446,8 @@ int ft_enter(struct tree_context* c) switch ( file->attr & FILE_ATTR_MASK ) { case FILE_ATTR_M3U: - play = ft_play_playlist(buf, c->currdir, file->name); - - if (play) - { - start_index = 0; - } - + if (!bookmark_autoload(buf)) + playlist_viewer_ex(buf); break; case FILE_ATTR_AUDIO: -- cgit v1.1