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

1 files changed, 2 insertions, 12 deletions

diff --git a/apps/logfdisp.c b/apps/logfdisp.c
index 9d62383da4..734a6aec63 100644
--- a/apps/logfdisp.c
+++ b/apps/logfdisp.c
@@ -24,20 +24,12 @@
 #include <timefuncs.h>
 #include <string.h>
 #include <kernel.h>
-#include <button.h>
+#include <action.h>
 
 #include <lcd.h>
 #include "menu.h"
 #include "logf.h"
 
-#if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
-#define LOGF_BUTTON_QUIT BUTTON_MENU
-#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
-#define LOGF_BUTTON_QUIT BUTTON_POWER
-#else
-#define LOGF_BUTTON_QUIT BUTTON_OFF
-#endif
-
 #ifdef HAVE_LCD_BITMAP
 bool logfdisplay(void)
 
@@ -46,7 +38,6 @@ bool logfdisplay(void)
     int lines;
     int columns;
     int i;
-    int button;
 
     bool lcd = false; /* fixed atm */
     int index;
@@ -93,8 +84,7 @@ bool logfdisplay(void)
             lcd_puts(0, i, buffer);
         }
         lcd_update();
-        button = button_get_w_tmo(HZ/2);
-    } while(button != LOGF_BUTTON_QUIT);
+    } while(!action_userabort(HZ));
 
     return false;
 }