diff options
| author | Zakk Roberts <midk@rockbox.org> | 2006-04-10 03:51:17 +0000 |
|---|---|---|
| committer | Zakk Roberts <midk@rockbox.org> | 2006-04-10 03:51:17 +0000 |
| commit | 2f943b054c4eb630c9b5b7170da38e494c1be235 (patch) | |
| tree | a72d3e22c88f7ddb67e9a8d01a94e9927001c702 /apps/gui/quickscreen.h | |
| parent | bf6f9c66a158a478d639672857bbf9bac791dd30 (diff) | |
| download | rockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.tar.gz rockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.zip | |
Enabled the quickscreen for iAudio X5. Globally, REC enters the menu and holding REC enters the quickscreen. Also moved the quickscreen #define to model config files, which simplifies the checking for it and makes checking more consistent. Cleaned up keymappings in quickscreen.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9590 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/quickscreen.h')
| -rw-r--r-- | apps/gui/quickscreen.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h index e6e04c94ae..55e5a2d8c5 100644 --- a/apps/gui/quickscreen.h +++ b/apps/gui/quickscreen.h @@ -18,32 +18,26 @@ ****************************************************************************/ #include "button.h" #include "config.h" -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD) ||\ - (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) ||\ - (CONFIG_KEYPAD == IPOD_3G_PAD) + +#ifdef HAVE_QUICKSCREEN #ifndef _GUI_QUICKSCREEN_H_ #define _GUI_QUICKSCREEN_H_ -#define HAS_QUICKSCREEN - #include "option_select.h" #include "screen_access.h" #define QUICKSCREEN_LEFT BUTTON_LEFT #define QUICKSCREEN_RIGHT BUTTON_RIGHT -#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) ||\ - (CONFIG_KEYPAD == RECORDER_PAD) +#if (CONFIG_KEYPAD == RECORDER_PAD) +#define QUICKSCREEN_BOTTOM BUTTON_DOWN +#define QUICKSCREEN_BOTTOM_INV BUTTON_UP +#define QUICKSCREEN_QUIT BUTTON_F3 +#define QUICKSCREEN_QUIT2 BUTTON_OFF +#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #define QUICKSCREEN_BOTTOM BUTTON_DOWN #define QUICKSCREEN_BOTTOM_INV BUTTON_UP -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) -#define QUICKSCREEN_BOTTOM BUTTON_PLAY -#define QUICKSCREEN_QUIT BUTTON_MENU -#define QUICKSCREEN_QUIT2 BUTTON_SELECT -#endif - -#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #define QUICKSCREEN_QUIT BUTTON_MODE #define QUICKSCREEN_QUIT2 BUTTON_OFF #define QUICKSCREEN_RC_QUIT BUTTON_RC_MODE @@ -53,7 +47,14 @@ #define QUICKSCREEN_RC_BOTTOM_INV BUTTON_RC_VOL_UP #define QUICKSCREEN_RC_RIGHT BUTTON_RC_FF #endif - +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#define QUICKSCREEN_BOTTOM BUTTON_PLAY +#define QUICKSCREEN_QUIT BUTTON_MENU +#define QUICKSCREEN_QUIT2 BUTTON_SELECT +#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) +#define QUICKSCREEN_BOTTOM BUTTON_DOWN +#define QUICKSCREEN_QUIT BUTTON_REC +#define QUICKSCREEN_QUIT2 BUTTON_POWER #endif struct gui_quickscreen; @@ -118,4 +119,4 @@ void gui_syncquickscreen_draw(struct gui_quickscreen * qs); bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter); #endif /*_GUI_QUICK_SCREEN_H_*/ -#endif /* CONFIG_KEYPAD */ +#endif /* HAVE_QUICKSCREEN */ |