From 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 Mon Sep 17 00:00:00 2001
From: Linus Nielsen Feltzing <linus@haxx.se>
Date: Tue, 15 Aug 2006 12:27:07 +0000
Subject: 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
---
 apps/playlist.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'apps/playlist.c')

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 @@
 #include <string.h>
 #include "playlist.h"
 #include "file.h"
+#include "action.h"
 #include "dir.h"
 #include "sprintf.h"
 #include "debug.h"
@@ -1342,7 +1343,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion)
         for (i=0; i<num_files; i++)
         {
             /* user abort */
-            if (button_get(false) == SETTINGS_CANCEL)
+            if (action_userabort(TIMEOUT_NOBLOCK))
             {
                 result = -1;
                 exit = true;
@@ -1440,7 +1441,7 @@ static int check_subdir_for_music(char *dir, char *subdir)
     {
         for (i=0; i<num_files; i++)
         {
-            if (button_get(false) == SETTINGS_CANCEL)
+            if (action_userabort(TIMEOUT_NOBLOCK))
             {
                 result = -2;
                 break;
@@ -1888,7 +1889,7 @@ int playlist_resume(void)
                                str(LANG_OFF_ABORT)
 #endif
                                );
-                if (SETTINGS_CANCEL == button_get(false))
+                if (action_userabort(TIMEOUT_NOBLOCK))
                 {
                     /* FIXME: 
                      * Not sure how to implement this, somebody more familiar
@@ -2870,7 +2871,7 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename,
     while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0)
     {
         /* user abort */
-        if (button_get(false) == SETTINGS_CANCEL)
+        if (action_userabort(TIMEOUT_NOBLOCK))
             break;
 
         if (temp_buf[0] != '#' && temp_buf[0] != '\0')
@@ -3281,7 +3282,7 @@ int playlist_save(struct playlist_info* playlist, char *filename)
         int seek;
 
         /* user abort */
-        if (button_get(false) == SETTINGS_CANCEL)
+        if (action_userabort(TIMEOUT_NOBLOCK))
         {
             result = -1;
             break;
@@ -3408,7 +3409,7 @@ int playlist_directory_tracksearch(const char* dirname, bool recurse,
     for (i=0; i<num_files; i++)
     {
         /* user abort */
-        if (button_get(false) == SETTINGS_CANCEL)
+        if (action_userabort(TIMEOUT_NOBLOCK))
         {
             result = -1;
             break;
-- 
cgit v1.2.3