diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
commit | 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 (patch) | |
tree | bae2154b272f786983cf8e6de28d33f98f327560 /apps/playlist.c | |
parent | c0f8b187706364f5e4bda2ac26750d14454c901d (diff) | |
download | rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.tar.gz rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.zip |
Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playlist.c')
-rw-r--r-- | apps/playlist.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index a51e8f501c..aa84bb090f 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -70,6 +70,7 @@ | |||
70 | #include <string.h> | 70 | #include <string.h> |
71 | #include "playlist.h" | 71 | #include "playlist.h" |
72 | #include "file.h" | 72 | #include "file.h" |
73 | #include "action.h" | ||
73 | #include "dir.h" | 74 | #include "dir.h" |
74 | #include "sprintf.h" | 75 | #include "sprintf.h" |
75 | #include "debug.h" | 76 | #include "debug.h" |
@@ -1342,7 +1343,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion) | |||
1342 | for (i=0; i<num_files; i++) | 1343 | for (i=0; i<num_files; i++) |
1343 | { | 1344 | { |
1344 | /* user abort */ | 1345 | /* user abort */ |
1345 | if (button_get(false) == SETTINGS_CANCEL) | 1346 | if (action_userabort(TIMEOUT_NOBLOCK)) |
1346 | { | 1347 | { |
1347 | result = -1; | 1348 | result = -1; |
1348 | exit = true; | 1349 | exit = true; |
@@ -1440,7 +1441,7 @@ static int check_subdir_for_music(char *dir, char *subdir) | |||
1440 | { | 1441 | { |
1441 | for (i=0; i<num_files; i++) | 1442 | for (i=0; i<num_files; i++) |
1442 | { | 1443 | { |
1443 | if (button_get(false) == SETTINGS_CANCEL) | 1444 | if (action_userabort(TIMEOUT_NOBLOCK)) |
1444 | { | 1445 | { |
1445 | result = -2; | 1446 | result = -2; |
1446 | break; | 1447 | break; |
@@ -1888,7 +1889,7 @@ int playlist_resume(void) | |||
1888 | str(LANG_OFF_ABORT) | 1889 | str(LANG_OFF_ABORT) |
1889 | #endif | 1890 | #endif |
1890 | ); | 1891 | ); |
1891 | if (SETTINGS_CANCEL == button_get(false)) | 1892 | if (action_userabort(TIMEOUT_NOBLOCK)) |
1892 | { | 1893 | { |
1893 | /* FIXME: | 1894 | /* FIXME: |
1894 | * Not sure how to implement this, somebody more familiar | 1895 | * Not sure how to implement this, somebody more familiar |
@@ -2870,7 +2871,7 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename, | |||
2870 | while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0) | 2871 | while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0) |
2871 | { | 2872 | { |
2872 | /* user abort */ | 2873 | /* user abort */ |
2873 | if (button_get(false) == SETTINGS_CANCEL) | 2874 | if (action_userabort(TIMEOUT_NOBLOCK)) |
2874 | break; | 2875 | break; |
2875 | 2876 | ||
2876 | if (temp_buf[0] != '#' && temp_buf[0] != '\0') | 2877 | if (temp_buf[0] != '#' && temp_buf[0] != '\0') |
@@ -3281,7 +3282,7 @@ int playlist_save(struct playlist_info* playlist, char *filename) | |||
3281 | int seek; | 3282 | int seek; |
3282 | 3283 | ||
3283 | /* user abort */ | 3284 | /* user abort */ |
3284 | if (button_get(false) == SETTINGS_CANCEL) | 3285 | if (action_userabort(TIMEOUT_NOBLOCK)) |
3285 | { | 3286 | { |
3286 | result = -1; | 3287 | result = -1; |
3287 | break; | 3288 | break; |
@@ -3408,7 +3409,7 @@ int playlist_directory_tracksearch(const char* dirname, bool recurse, | |||
3408 | for (i=0; i<num_files; i++) | 3409 | for (i=0; i<num_files; i++) |
3409 | { | 3410 | { |
3410 | /* user abort */ | 3411 | /* user abort */ |
3411 | if (button_get(false) == SETTINGS_CANCEL) | 3412 | if (action_userabort(TIMEOUT_NOBLOCK)) |
3412 | { | 3413 | { |
3413 | result = -1; | 3414 | result = -1; |
3414 | break; | 3415 | break; |