diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-28 12:41:15 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-28 12:41:15 +0000 |
commit | f331d19a427fcb6557cdeba9f1846a44097e456c (patch) | |
tree | fb66c95b6c4bd060be86991482c1ebdc2c6164ef /apps/filetree.c | |
parent | 8ed7ba1d7bdb813687805b7f2c2927d08fc86ed4 (diff) | |
download | rockbox-f331d19a427fcb6557cdeba9f1846a44097e456c.tar.gz rockbox-f331d19a427fcb6557cdeba9f1846a44097e456c.zip |
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
Diffstat (limited to 'apps/filetree.c')
-rw-r--r-- | apps/filetree.c | 12 |
1 files 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 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * __________ __ ___. | 2 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
@@ -44,7 +44,6 @@ | |||
44 | #include "filetree.h" | 44 | #include "filetree.h" |
45 | #include "misc.h" | 45 | #include "misc.h" |
46 | #include "strnatcmp.h" | 46 | #include "strnatcmp.h" |
47 | #include "playlist_viewer.h" | ||
48 | #ifdef HAVE_LCD_BITMAP | 47 | #ifdef HAVE_LCD_BITMAP |
49 | #include "keyboard.h" | 48 | #include "keyboard.h" |
50 | #endif | 49 | #endif |
@@ -459,8 +458,13 @@ int ft_enter(struct tree_context* c) | |||
459 | 458 | ||
460 | switch ( file_attr & FILE_ATTR_MASK ) { | 459 | switch ( file_attr & FILE_ATTR_MASK ) { |
461 | case FILE_ATTR_M3U: | 460 | case FILE_ATTR_M3U: |
462 | if (!bookmark_autoload(buf)) | 461 | play = ft_play_playlist(buf, c->currdir, file->name); |
463 | playlist_viewer_ex(buf); | 462 | |
463 | if (play) | ||
464 | { | ||
465 | start_index = 0; | ||
466 | } | ||
467 | |||
464 | break; | 468 | break; |
465 | 469 | ||
466 | case FILE_ATTR_AUDIO: | 470 | case FILE_ATTR_AUDIO: |