From d9bf26a127ceb554263e9034bdb46e348df51d4c Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Thu, 13 Sep 2007 22:21:40 +0000 Subject: [PATCH] Remove the ability to restart chessbox with a button (combo). It became redundant since there is a menu item for it; it didn't work on M5 or X5 before and there was a good chance of restarting accidentally. Also update the manual accordingly. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14687 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/chessbox/chessbox.c | 13 ------------- manual/plugins/chessbox.tex | 8 -------- 2 files changed, 21 deletions(-) diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 8e3d889dff..2ff808d52c 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c @@ -50,7 +50,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY (BUTTON_SELECT | BUTTON_PLAY) #define CB_LEVEL (BUTTON_SELECT | BUTTON_RIGHT) -#define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT) #define CB_MENU (BUTTON_SELECT | BUTTON_MENU) #define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) @@ -66,7 +65,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY BUTTON_PLAY #define CB_LEVEL BUTTON_REC -#define CB_RESTART (BUTTON_SELECT | BUTTON_PLAY) #define CB_MENU BUTTON_POWER #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) @@ -82,7 +80,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY BUTTON_ON #define CB_LEVEL BUTTON_MODE -#define CB_RESTART BUTTON_REC #define CB_MENU BUTTON_OFF #define CB_RC_QUIT BUTTON_RC_STOP @@ -115,7 +112,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY BUTTON_ON #define CB_LEVEL BUTTON_F1 -#define CB_RESTART BUTTON_F3 #define CB_MENU BUTTON_OFF #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) @@ -131,7 +127,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY BUTTON_ON #define CB_LEVEL BUTTON_F1 -#define CB_RESTART BUTTON_F3 #define CB_MENU BUTTON_OFF #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) @@ -149,7 +144,6 @@ PLUGIN_HEADER #define CB_PLAY_PRE BUTTON_MENU #define CB_PLAY (BUTTON_MENU|BUTTON_REPEAT) #define CB_LEVEL (BUTTON_MENU|BUTTON_OFF) -#define CB_RESTART (BUTTON_MENU|BUTTON_LEFT) #define CB_MENU BUTTON_OFF #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) @@ -180,7 +174,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY BUTTON_PLAY #define CB_LEVEL BUTTON_FF -#define CB_RESTART (BUTTON_REW | BUTTON_PLAY) #define CB_MENU BUTTON_POWER #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) @@ -196,7 +189,6 @@ PLUGIN_HEADER #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY (BUTTON_SELECT | BUTTON_RIGHT) #define CB_LEVEL BUTTON_REC -#define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) #define CB_MENU BUTTON_POWER #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) @@ -835,11 +827,6 @@ struct cb_command cb_getcommand (void) { case CB_MENU: result.type = cb_menu(); return result; -#ifdef CB_RESTART - case CB_RESTART: - result.type = COMMAND_RESTART; - return result; -#endif case CB_LEVEL: result.type = COMMAND_LEVEL; return result; diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex index 0bb9528ad9..d4116221d7 100644 --- a/manual/plugins/chessbox.tex +++ b/manual/plugins/chessbox.tex @@ -46,14 +46,6 @@ the game. \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonRight} & Force play\\ - \opt{RECORDER_PAD}{\ButtonFThree} - \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft} - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} - \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} - \opt{IAUDIO_X5_PAD}{\ButtonSelect+\ButtonPlay} - \opt{IRIVER_H10_PAD}{\ButtonRew+\ButtonPlay} - \opt{SANSA_E200_PAD}{Hold \ButtonSelect} - & Restart Game\\ \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}