len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

playlist handling: revert part of r30177.

Browse source 
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
This commit is contained in:
Jonathan Gordon 2011-11-28 12:41:15 +00:00
parent 8ed7ba1d7b
commit f331d19a42
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/filetree.c
View file

@ -1,4 +1,4 @@
/*************************************************************************** /***************************************************************************
* __________ __ ___. * __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
@ -44,7 +44,6 @@
#include "filetree.h" #include "filetree.h"
#include "misc.h" #include "misc.h"
#include "strnatcmp.h" #include "strnatcmp.h"
#include "playlist_viewer.h"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#include "keyboard.h" #include "keyboard.h"
#endif #endif
@ -459,8 +458,13 @@ int ft_enter(struct tree_context* c)
switch ( file_attr & FILE_ATTR_MASK ) { switch ( file_attr & FILE_ATTR_MASK ) {
case FILE_ATTR_M3U: case FILE_ATTR_M3U:
if (!bookmark_autoload(buf)) play = ft_play_playlist(buf, c->currdir, file->name);
playlist_viewer_ex(buf);
if (play)
{
start_index = 0;
}
break; break;
case FILE_ATTR_AUDIO: case FILE_ATTR_AUDIO: