summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2009-10-03 20:37:55 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2009-10-03 20:37:55 +0000
commit21e349666d418c2f3cf41bedb592b8a60cec3aa2 (patch)
tree4c7935bf7baabd3cb1f73c3d55ab13f68a0b6aeb /apps
parentc3f6577a98ba138f1bfe49c95861cb852f33e960 (diff)
downloadrockbox-21e349666d418c2f3cf41bedb592b8a60cec3aa2.zip
rockbox-21e349666d418c2f3cf41bedb592b8a60cec3aa2.tar.gz
rockbox-21e349666d418c2f3cf41bedb592b8a60cec3aa2.tar.bz2
rockbox-21e349666d418c2f3cf41bedb592b8a60cec3aa2.tar.xz
- Fixed typo in comments
- Added some comments - Removed spaces at the end of lines git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22897 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/keymaps/keymap-ipod.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 99c7f93..2b34fbc 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -6,7 +6,7 @@
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
- *
+ *
* Copyright (C) 2006 Jonathan Gordon
*
* This program is free software; you can redistribute it and/or
@@ -26,13 +26,13 @@
#include "button.h"
#include "settings.h"
-/*
+/*
* The format of the list is as follows
- * { Action Code, Button code, Prereq button code }
+ * { Action Code, Button code, Prereq button code }
* if there's no need to check the previous button's value, use BUTTON_NONE
- * Insert LAST_ITEM_IN_LIST at the end of each mapping
+ * Insert LAST_ITEM_IN_LIST at the end of each mapping
*/
-
+
/* CONTEXT_CUSTOM's used in this file...
CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
@@ -47,7 +47,6 @@ static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
-
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
@@ -56,10 +55,11 @@ static const struct button_mapping button_context_standard[] = {
LAST_ITEM_IN_LIST
}; /* button_context_standard */
+
static const struct button_mapping button_context_tree[] = {
{ ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
-
+
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_tree */
@@ -74,7 +74,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = {
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
-};
+}; /* button_context_tree_scroll_lr */
static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
@@ -94,7 +94,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE },
{ ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
-
+
LAST_ITEM_IN_LIST,
}; /* button_context_wps */
@@ -108,20 +108,20 @@ static const struct button_mapping button_context_settings[] = {
{ ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
- { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
-
+ { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
+
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_settings */
static const struct button_mapping button_context_yesno[] = {
{ ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
LAST_ITEM_IN_LIST
-}; /* button_context_settings_yesno */
+}; /* button_context_yesno */
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
-}; /* button_context_settings_bmark */
+}; /* button_context_bmark */
static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_QS_TOP, BUTTON_MENU, BUTTON_NONE },
@@ -133,7 +133,7 @@ static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE },
-
+
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_quickscreen */
@@ -151,7 +151,7 @@ static const struct button_mapping button_context_pitchscreen[] = {
{ ACTION_PS_EXIT, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-
+
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_pitchscreen */
@@ -174,7 +174,7 @@ static const struct button_mapping button_context_keyboard[] = {
#ifdef HAVE_RECORDING
const struct button_mapping button_context_recscreen[] = {
-
+
{ ACTION_REC_NEWFILE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
@@ -188,7 +188,7 @@ const struct button_mapping button_context_recscreen[] = {
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
-
+
LAST_ITEM_IN_LIST
}; /* button_context_recscreen */
#endif
@@ -249,7 +249,7 @@ static const struct button_mapping remote_button_context_standard[] = {
{ ACTION_STD_OK, BUTTON_RC_PLAY, BUTTON_NONE },
LAST_ITEM_IN_LIST
-};
+}; /* remote_button_context_standard */
static const struct button_mapping remote_button_context_wps[] = {
{ ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
@@ -267,7 +267,7 @@ static const struct button_mapping remote_button_context_wps[] = {
{ ACTION_WPS_STOPSEEK, BUTTON_RC_LEFT|BUTTON_REL, BUTTON_RC_LEFT|BUTTON_REPEAT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-};
+}; /* remote_button_context_wps */
#ifdef USB_ENABLE_HID
static const struct button_mapping remote_button_context_usb_hid[] = {
@@ -289,7 +289,7 @@ static const struct button_mapping remote_button_context_usb_hid[] = {
static const struct button_mapping* get_context_mapping_remote( int context )
{
context ^= CONTEXT_REMOTE;
-
+
switch (context)
{
case CONTEXT_WPS:
@@ -311,14 +311,14 @@ const struct button_mapping* get_context_mapping(int context)
if (context&CONTEXT_REMOTE)
return get_context_mapping_remote(context);
#endif
-
+
switch (context)
{
case CONTEXT_STD:
return button_context_standard;
case CONTEXT_WPS:
return button_context_wps;
-
+
case CONTEXT_TREE:
case CONTEXT_MAINMENU:
if (global_settings.hold_lr_for_scroll_in_list)
@@ -326,10 +326,10 @@ const struct button_mapping* get_context_mapping(int context)
/* else fall through to CUSTOM|CONTEXT_TREE */
case CONTEXT_CUSTOM|CONTEXT_TREE:
return button_context_tree;
-
+
case CONTEXT_LIST:
return button_context_standard;
-
+
case CONTEXT_SETTINGS_EQ:
case CONTEXT_SETTINGS_COLOURCHOOSER:
case CONTEXT_SETTINGS_TIME:
@@ -358,6 +358,6 @@ const struct button_mapping* get_context_mapping(int context)
#endif
default:
return button_context_standard;
- }
+ }
return button_context_standard;
}