From f331d19a427fcb6557cdeba9f1846a44097e456c Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 28 Nov 2011 12:41:15 +0000 Subject: playlist handling: revert part of r30177. loading a .m3u from the filebrowser now just runs it like it used to, selecting a playlist from inside the catalogue viewer opens it instead. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31083 a1c6a512-1295-4272-9138-f99709370657 --- apps/filetree.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/filetree.c b/apps/filetree.c index aa527e017f..4e7c2745b4 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -1,4 +1,4 @@ - /*************************************************************************** +/*************************************************************************** * __________ __ ___. * Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / @@ -44,7 +44,6 @@ #include "filetree.h" #include "misc.h" #include "strnatcmp.h" -#include "playlist_viewer.h" #ifdef HAVE_LCD_BITMAP #include "keyboard.h" #endif @@ -459,8 +458,13 @@ int ft_enter(struct tree_context* c) switch ( file_attr & FILE_ATTR_MASK ) { case FILE_ATTR_M3U: - if (!bookmark_autoload(buf)) - playlist_viewer_ex(buf); + play = ft_play_playlist(buf, c->currdir, file->name); + + if (play) + { + start_index = 0; + } + break; case FILE_ATTR_AUDIO: -- cgit v1.2.3