From 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing 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/gui/select.h | 98 ------------------------------------------------------- 1 file changed, 98 deletions(-) (limited to 'apps/gui/select.h') diff --git a/apps/gui/select.h b/apps/gui/select.h index 9270214d61..2556a683c8 100644 --- a/apps/gui/select.h +++ b/apps/gui/select.h @@ -23,104 +23,6 @@ #include "settings.h" #include "option_select.h" -#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ - (CONFIG_KEYPAD == IRIVER_H300_PAD) -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_SELECT -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_OFF -#define SELECT_CANCEL2 BUTTON_MODE - -#define SELECT_RC_INC BUTTON_RC_FF -#define SELECT_RC_DEC BUTTON_RC_REW -#define SELECT_RC_OK BUTTON_RC_ON -#define SELECT_RC_OK2 BUTTON_RC_MENU -#define SELECT_RC_CANCEL BUTTON_RC_STOP -#define SELECT_RC_CANCEL2 BUTTON_RC_MODE - -#elif CONFIG_KEYPAD == RECORDER_PAD -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_PLAY -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_OFF -#define SELECT_CANCEL2 BUTTON_F1 - -#define SELECT_RC_INC BUTTON_RC_RIGHT -#define SELECT_RC_DEC BUTTON_RC_LEFT -#define SELECT_RC_OK BUTTON_RC_PLAY -#define SELECT_RC_CANCEL BUTTON_RC_STOP - -#elif CONFIG_KEYPAD == PLAYER_PAD -#define SELECT_INC BUTTON_RIGHT -#define SELECT_DEC BUTTON_LEFT -#define SELECT_OK BUTTON_PLAY -#define SELECT_CANCEL BUTTON_STOP -#define SELECT_CANCEL2 BUTTON_MENU - -#define SELECT_RC_INC BUTTON_RC_RIGHT -#define SELECT_RC_DEC BUTTON_RC_LEFT -#define SELECT_RC_OK BUTTON_RC_PLAY -#define SELECT_RC_CANCEL BUTTON_RC_STOP - -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) -#define SELECT_INC BUTTON_SCROLL_FWD -#define SELECT_DEC BUTTON_SCROLL_BACK -#define SELECT_OK BUTTON_SELECT -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_MENU - -#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_RIGHT -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_PLAY -#define SELECT_CANCEL2 BUTTON_MODE - -#elif CONFIG_KEYPAD == ONDIO_PAD -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_RIGHT -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_MENU -#define SELECT_CANCEL2 BUTTON_OFF - -#elif CONFIG_KEYPAD == GMINI100_PAD -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_PLAY -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_OFF -#define SELECT_CANCEL2 BUTTON_MENU - -#elif CONFIG_KEYPAD == IAUDIO_X5_PAD -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_SELECT -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_PLAY -#define SELECT_CANCEL2 BUTTON_POWER - -#elif CONFIG_KEYPAD == GIGABEAT_PAD -#define SELECT_INC BUTTON_UP -#define SELECT_DEC BUTTON_DOWN -#define SELECT_OK BUTTON_MENU -#define SELECT_OK2 BUTTON_LEFT -#define SELECT_CANCEL BUTTON_A -#define SELECT_CANCEL2 BUTTON_POWER - -#elif CONFIG_KEYPAD == IRIVER_H10_PAD -#define SELECT_INC BUTTON_SCROLL_UP -#define SELECT_DEC BUTTON_SCROLL_DOWN -#define SELECT_OK BUTTON_PLAY -#define SELECT_OK2 BUTTON_RIGHT -#define SELECT_CANCEL BUTTON_POWER -#define SELECT_CANCEL2 BUTTON_LEFT - -#endif - struct gui_select { bool canceled; -- cgit v1.2.3